Merge branch 'main' into important-dates-ids

.github/workflows/build.yml

@@ -149,7 +149,8 @@ jobs:
     name: Make Release
     if: ${{ !failure() && !cancelled() }}
     needs: [tests, prepare]
-    runs-on: ubuntu-latest
+    runs-on:
+      group: hperf-8c32r
     permissions:
       contents: write
       packages: write
@@ -166,215 +167,107 @@ jobs:
         fetch-depth: 1
         fetch-tags: false
 
-    - name: Launch build VM
-      id: azlaunch
-      timeout-minutes: 10
+    - name: Setup Node.js environment
+      uses: actions/setup-node@v4
+      with:
+        node-version: 18.x
+
+    - name: Setup Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.x"
+
+    - name: Download a Coverage Results
+      if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
+      uses: actions/[email protected]
+      with:
+        name: coverage
+
+    - name: Make Release Build
+      env:
+        DEBIAN_FRONTEND: noninteractive
+        BROWSERSLIST_IGNORE_OLD_DATA: 1
       run: |
-        echo "Authenticating to Azure..."
-        az login --service-principal -u ${{ secrets.AZ_BUILD_APP_ID }} -p ${{ secrets.AZ_BUILD_PWD }} --tenant ${{ secrets.AZ_BUILD_TENANT_ID }}
-        
-        echo "Creating VM..."
-        vminfo=$(az vm create \
-          --resource-group ghaDatatracker \
-          --name tmpGhaBuildVM-${{ github.run_number }} \
-          --image Ubuntu2204 \
-          --admin-username azureuser \
-          --generate-ssh-keys \
-          --priority Spot \
-          --size Standard_D8ads_v5 \
-          --max-price -1 \
-          --ephemeral-os-disk \
-          --os-disk-size-gb 100 \
-          --eviction-policy Delete \
-          --nic-delete-option Delete \
-          --os-disk-delete-option Delete \
-          --output tsv \
-          --query "publicIpAddress")
-        echo "ipaddr=$vminfo" >> "$GITHUB_OUTPUT"
-        echo "VM Public IP: $vminfo"
-        cat ~/.ssh/id_rsa > ${{ github.workspace }}/prvkey.key
+        echo "PKG_VERSION: $PKG_VERSION"
+        echo "GITHUB_SHA: $GITHUB_SHA"
+        echo "GITHUB_REF_NAME: $GITHUB_REF_NAME"
+        echo "Running frontend build script..."
+        echo "Compiling native node packages..."
+        yarn rebuild
+        echo "Packaging static assets..."
+        yarn build --base=https://static.ietf.org/dt/$PKG_VERSION/
+        yarn legacy:build
+        echo "Setting version $PKG_VERSION..."
+        sed -i -r -e "s|^__version__ += '.*'$|__version__ = '$PKG_VERSION'|" ietf/__init__.py
+        sed -i -r -e "s|^__release_hash__ += '.*'$|__release_hash__ = '$GITHUB_SHA'|" ietf/__init__.py
+        sed -i -r -e "s|^__release_branch__ += '.*'$|__release_branch__ = '$GITHUB_REF_NAME'|" ietf/__init__.py
+
+    - name: Set Production Flags
+      if: ${{ env.SHOULD_DEPLOY == 'true' }}
+      run: |
+        echo "Setting production flags in settings.py..."
+        sed -i -r -e 's/^DEBUG *= *.*$/DEBUG = False/' -e "s/^SERVER_MODE *= *.*\$/SERVER_MODE = 'production'/" ietf/settings.py
         
-        echo "Fetching SSH host public keys..."
-        until ssh-keyscan -t rsa $vminfo 2> /dev/null
-        do
-          echo "Will try again in 5 seconds..."
-          sleep 5
-        done
-        ssh-keyscan -t rsa $vminfo >> ~/.ssh/known_hosts
+    - name: Make Release Tarball
+      env:
+        DEBIAN_FRONTEND: noninteractive
+      run: |
+        echo "Build release tarball..."
+        mkdir -p /home/runner/work/release
+        tar -czf /home/runner/work/release/release.tar.gz -X dev/build/exclude-patterns.txt .
 
-    - name: Remote SSH into Build VM
-      uses: appleboy/ssh-action@25ce8cbbcb08177468c7ff7ec5cbfa236f9341e1
+    - name: Collect + Push Statics
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        GITHUB_ACTOR: ${{ github.actor }}
-        GITHUB_SHA: ${{ github.sha }}
-        GITHUB_REF_NAME: ${{ github.ref_name }}
-        GITHUB_RUN_ID: ${{ github.run_id }}
+        DEBIAN_FRONTEND: noninteractive
         AWS_ACCESS_KEY_ID: ${{ secrets.CF_R2_STATIC_KEY_ID }}
         AWS_SECRET_ACCESS_KEY: ${{ secrets.CF_R2_STATIC_KEY_SECRET }}
         AWS_DEFAULT_REGION: auto
         AWS_ENDPOINT_URL: ${{ secrets.CF_R2_ENDPOINT }}
-        PKG_VERSION: ${{ env.PKG_VERSION }}
-        SHOULD_DEPLOY: ${{ env.SHOULD_DEPLOY }}
-        SKIP_TESTS: ${{ github.event.inputs.skiptests }}
+      run: |
+        echo "Collecting statics..."
+        echo "Using ghcr.io/ietf-tools/datatracker-app-base:${{ env.TARGET_BASE }}"
+        docker run --rm --name collectstatics -v $(pwd):/workspace ghcr.io/ietf-tools/datatracker-app-base:${{ env.TARGET_BASE }} sh dev/build/collectstatics.sh
+        echo "Pushing statics..."
+        cd static
+        aws s3 sync . s3://static/dt/$PKG_VERSION --only-show-errors
+
+    - name: Augment dockerignore for docker image build
+      env:
         DEBIAN_FRONTEND: noninteractive
-        BROWSERSLIST_IGNORE_OLD_DATA: 1
-        TARGET_BASE: ${{ env.TARGET_BASE }}
+      run: |
+        cat >> .dockerignore <<EOL
+        .devcontainer
+        .github
+        .vscode
+        k8s
+        playwright
+        svn-history
+        docker-compose.yml
+        EOL
+
+    - name: Setup Docker Buildx
+      uses: docker/setup-buildx-action@v3
+
+    - name: Login to GitHub Container Registry
+      uses: docker/login-action@v3
       with:
-        host: ${{ steps.azlaunch.outputs.ipaddr }}
-        port: 22
-        username: azureuser
-        command_timeout: 60m
-        key_path: ${{ github.workspace }}/prvkey.key
-        envs: GITHUB_TOKEN,GITHUB_ACTOR,GITHUB_SHA,GITHUB_REF_NAME,GITHUB_RUN_ID,AWS_ACCESS_KEY_ID,AWS_SECRET_ACCESS_KEY,AWS_DEFAULT_REGION,AWS_ENDPOINT_URL,PKG_VERSION,SHOULD_DEPLOY,SKIP_TESTS,DEBIAN_FRONTEND,BROWSERSLIST_IGNORE_OLD_DATA
-        script_stop: true
-        script: |
-          export DEBIAN_FRONTEND=noninteractive
-          lsb_release -a
-          sudo apt-get update
-          sudo apt-get upgrade -y
-          sudo apt-get install wget unzip curl -y
-
-          echo "=========================================================================="
-          echo "Installing Docker..."
-          echo "=========================================================================="
-          curl -fsSL https://get.docker.com -o get-docker.sh
-          sudo sh get-docker.sh
-          sudo docker buildx create \
-            --name container-builder \
-            --driver docker-container \
-            --bootstrap --use
-
-          echo "=========================================================================="
-          echo "Login to ghcr.io..."
-          echo "=========================================================================="
-          echo $GITHUB_TOKEN | sudo docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-
-          echo "=========================================================================="
-          echo "Installing GH CLI..."
-          echo "=========================================================================="
-          sudo mkdir -p -m 755 /etc/apt/keyrings \
-          	&& wget -qO- https://cli.github.com/packages/githubcli-archive-keyring.gpg | sudo tee /etc/apt/keyrings/githubcli-archive-keyring.gpg > /dev/null \
-          	&& sudo chmod go+r /etc/apt/keyrings/githubcli-archive-keyring.gpg \
-          	&& echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/githubcli-archive-keyring.gpg] https://cli.github.com/packages stable main" | sudo tee /etc/apt/sources.list.d/github-cli.list > /dev/null \
-          	&& sudo apt update \
-          	&& sudo apt install gh -y
-
-          echo "=========================================================================="
-          echo "Installing AWS CLI..."
-          echo "=========================================================================="
-          curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip"
-          unzip awscliv2.zip
-          sudo ./aws/install
-
-          echo "=========================================================================="
-          echo "Install Node.js..."
-          echo "=========================================================================="
-          curl -fsSL https://deb.nodesource.com/setup_18.x -o nodesource_setup.sh
-          sudo bash nodesource_setup.sh
-          sudo apt-get install -y nodejs
-          sudo corepack enable
-
-          echo "=========================================================================="
-          echo "Install Python 3.x..."
-          echo "=========================================================================="
-          sudo apt-get install python3 python3-dev -y
-          python3 --version
-
-          echo "=========================================================================="
-          echo "Clone project..."
-          echo "=========================================================================="
-          sudo mkdir -p /workspace
-          sudo chown azureuser /workspace
-          cd /workspace
-          gh repo clone ietf-tools/datatracker -- --depth=1 --no-tags --branch ${{ github.ref_name }}
-          cd datatracker
-
-          if [ "$SKIP_TESTS" = "false" ] || [ "$GITHUB_REF_NAME" = "release" ] ; then
-            echo "=========================================================================="
-            echo "Downloading coverage..."
-            echo "=========================================================================="
-            gh run download $GITHUB_RUN_ID -n coverage
-          fi
-
-          echo "=========================================================================="
-          echo "Building project..."
-          echo "=========================================================================="
-          echo "PKG_VERSION: $PKG_VERSION"
-          echo "GITHUB_SHA: $GITHUB_SHA"
-          echo "GITHUB_REF_NAME: $GITHUB_REF_NAME"
-          echo "Running frontend build script..."
-          echo "Compiling native node packages..."
-          yarn rebuild
-          echo "Packaging static assets..."
-          yarn build --base=https://static.ietf.org/dt/$PKG_VERSION/
-          yarn legacy:build
-          echo "Setting version $PKG_VERSION..."
-          sed -i -r -e "s|^__version__ += '.*'$|__version__ = '$PKG_VERSION'|" ietf/__init__.py
-          sed -i -r -e "s|^__release_hash__ += '.*'$|__release_hash__ = '$GITHUB_SHA'|" ietf/__init__.py
-          sed -i -r -e "s|^__release_branch__ += '.*'$|__release_branch__ = '$GITHUB_REF_NAME'|" ietf/__init__.py
+        registry: ghcr.io
+        username: ${{ github.actor }}
+        password: ${{ secrets.GITHUB_TOKEN }}
 
-          if [ "$SHOULD_DEPLOY" = "true" ] ; then
-            echo "=========================================================================="
-            echo "Setting production flags in settings.py..."
-            echo "=========================================================================="
-            sed -i -r -e 's/^DEBUG *= *.*$/DEBUG = False/' -e "s/^SERVER_MODE *= *.*\$/SERVER_MODE = 'production'/" ietf/settings.py
-          fi
-
-          echo "=========================================================================="
-          echo "Build release tarball..."
-          echo "=========================================================================="
-          mkdir -p /workspace/release
-          tar -czf /workspace/release.tar.gz -X dev/build/exclude-patterns.txt .
-
-          echo "=========================================================================="
-          echo "Collecting statics..."
-          echo "=========================================================================="
-          echo "Using ghcr.io/ietf-tools/datatracker-app-base:${{ env.TARGET_BASE }}"
-          sudo docker run --rm --name collectstatics -v $(pwd):/workspace ghcr.io/ietf-tools/datatracker-app-base:${{ env.TARGET_BASE }} sh dev/build/collectstatics.sh
-          echo "Pushing statics..."
-          cd static
-          aws s3 sync . s3://static/dt/$PKG_VERSION --only-show-errors
-          cd ..
-
-          echo "=========================================================================="
-          echo "Augment dockerignore for docker image build..."
-          echo "=========================================================================="
-          cat >> .dockerignore <<EOL
-          .devcontainer
-          .github
-          .vscode
-          k8s
-          playwright
-          svn-history
-          docker-compose.yml
-          EOL
-
-          echo "=========================================================================="
-          echo "Building Images..."
-          echo "=========================================================================="
-          sudo docker buildx build --file dev/build/Dockerfile --platform linux/amd64,linux/arm64 --tag ghcr.io/ietf-tools/datatracker:$PKG_VERSION --push .
-
-    - name: Fetch release tarball
-      run: |
-        mkdir -p /home/runner/work/release
-        chmod 0600 ${{ github.workspace }}/prvkey.key
-        scp -i ${{ github.workspace }}/prvkey.key azureuser@${{ steps.azlaunch.outputs.ipaddr }}:/workspace/release.tar.gz /home/runner/work/release/release.tar.gz
+    - name: Build Images
+      uses: docker/build-push-action@v6
+      env:
+        DOCKER_BUILD_SUMMARY: false
+      with:
+        context: .
+        file: dev/build/Dockerfile
+        platforms: ${{ github.event.inputs.skiparm == 'true' && 'linux/amd64' || 'linux/amd64,linux/arm64' }}
+        push: true
+        tags: ghcr.io/ietf-tools/datatracker:${{ env.PKG_VERSION }}
+        cache-from: type=gha
+        cache-to: type=gha,mode=max
 
-    - name: Destroy Build VM + resources
-      if: always()
-      run: |
-        echo "Terminate VM..."        
-        az vm delete -g ghaDatatracker -n tmpGhaBuildVM-${{ github.run_number }} --yes --force-deletion true
-        echo "Delete Public IP..."
-        az resource delete -g ghaDatatracker -n tmpGhaBuildVM-${{ github.run_number }}PublicIP --resource-type "Microsoft.Network/publicIPAddresses"
-        echo "Delete Network Security Group..."
-        az resource delete -g ghaDatatracker -n tmpGhaBuildVM-${{ github.run_number }}NSG --resource-type "Microsoft.Network/networkSecurityGroups"
-        echo "Delete Virtual Network..."
-        az resource delete -g ghaDatatracker -n tmpGhaBuildVM-${{ github.run_number }}VNET --resource-type "Microsoft.Network/virtualNetworks"
-        echo "Logout from Azure..."
-        az logout
-        
     - name: Update CHANGELOG
       id: changelog
       uses: Requarks/changelog-action@v1

client/agenda/AgendaScheduleList.vue

@@ -83,6 +83,14 @@
                 template(#trigger)
                   span.badge.is-bof BoF
                 span #[a(href='https://www.ietf.org/how/bofs/', target='_blank') Birds of a Feather] sessions (BoFs) are initial discussions about a particular topic of interest to the IETF community.
+              n-popover(
+                v-if='item.isProposed'
+                trigger='hover'
+                :width='250'
+                )
+                template(#trigger)
+                  span.badge.is-proposed Proposed
+                span #[a(href='https://www.ietf.org/process/wgs/', target='_blank') Proposed WGs] are groups in the process of being chartered. If the charter is not approved by the IESG before the IETF meeting, the session may be canceled.
               .agenda-table-note(v-if='item.note')
                 i.bi.bi-arrow-return-right.me-1
                 span {{item.note}}
@@ -468,6 +476,7 @@ const meetingEvents = computed(() => {
       // groupParentName: item.groupParent?.name,
       icon,
       isBoF: item.isBoF,
+      isProposed: item.isProposed,
       isSessionEvent: item.type === 'regular',
       links,
       location: item.location,
@@ -1012,10 +1021,25 @@ onBeforeUnmount(() => {
         word-wrap: break-word;
       }
 
-      .badge.is-bof {
-        background-color: $teal-500;
+      .badge {
         margin: 0 8px;
 
+        &.is-bof {
+          background-color: $teal-500;
+
+          @at-root .theme-dark & {
+            background-color: $teal-700;
+          }
+        }
+
+        &.is-proposed {
+          background-color: $gray-500;
+
+          @at-root .theme-dark & {
+            background-color: $gray-700;
+          }
+        }
+
         @media screen and (max-width: $bs5-break-md) {
           width: 30px;
           display: block;

dev/build/Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/ietf-tools/datatracker-app-base:20241029T1632
+FROM ghcr.io/ietf-tools/datatracker-app-base:20241114T1954
 LABEL maintainer="IETF Tools Team <[email protected]>"
 
 ENV DEBIAN_FRONTEND=noninteractive

dev/build/TARGET_BASE

@@ -1 +1 @@
-20241029T1632
+20241114T1954

ietf/api/serializer.py

@@ -146,6 +146,7 @@ def end_object(self, obj):
                                 field_value = None
                         else:
                             field_value = field
+                        # Need QuerySetAny instead of QuerySet until django-stubs 5.0.1
                         if isinstance(field_value, QuerySetAny) or isinstance(field_value, list):
                             self._current[name] = dict([ (rel.pk, self.expand_related(rel, name)) for rel in field_value ])
                         else:

ietf/community/models.py

@@ -117,7 +117,7 @@ def notify_events(sender, instance, **kwargs):
     # start a Celery task during tests. To prevent this, don't queue a celery task if we're running
     # tests.
     if settings.SERVER_MODE != "test":
-        # Wrap in on_commit so the delayed task cannot start until the view is done with the DB
+        # Wrap in on_commit in case a transaction is open
         transaction.on_commit(
             lambda: notify_event_to_subscribers_task.delay(event_id=instance.pk)
         )