ci: merge main to release (#8778)

Author: rjsparks

.devcontainer/docker-compose.extend.yml

@@ -1,5 +1,3 @@
-version: '3.8'
-
 services:
     app:
         environment:

.github/ISSUE_TEMPLATE/config.yml

@@ -1,8 +1,8 @@
-blank_issues_enabled: false
-contact_links:
-  - name: Help and questions
-    url: https://github.com/ietf-tools/datatracker/discussions/categories/help-questions
-    about: Need help? Have a question on setting up the project or its usage?
-  - name: Discuss new ideas
-    url: https://github.com/ietf-tools/datatracker/discussions/categories/ideas
-    about: Submit ideas for new features or improvements to be discussed.
+blank_issues_enabled: false
+contact_links:
+  - name: Help and questions
+    url: https://github.com/ietf-tools/datatracker/discussions/categories/help-questions
+    about: Need help? Have a question on setting up the project or its usage?
+  - name: Discuss new ideas
+    url: https://github.com/ietf-tools/datatracker/discussions/categories/ideas
+    about: Submit ideas for new features or improvements to be discussed.

.github/workflows/build-base-app.yml

@@ -51,7 +51,7 @@ jobs:
         push: true
         tags: |
           ghcr.io/ietf-tools/datatracker-app-base:${{ env.IMGVERSION }}
-          ghcr.io/ietf-tools/datatracker-app-base:latest
+          ${{ github.ref == 'refs/heads/main' && 'ghcr.io/ietf-tools/datatracker-app-base:latest' || '' }}
 
     - name: Update version references
       run: |
@@ -61,6 +61,6 @@ jobs:
     - name: Commit CHANGELOG.md
       uses: stefanzweifel/git-auto-commit-action@v5
       with:
-        branch: main
+        branch: ${{ github.ref_name }}
         commit_message: 'ci: update base image target version to ${{ env.IMGVERSION }}'
         file_pattern: dev/build/Dockerfile dev/build/TARGET_BASE

.github/workflows/build-mq-broker.yml

@@ -8,10 +8,13 @@ on:
       - 'dev/mq/**'
       - '.github/workflows/build-mq-broker.yml'
 
-  workflow_dispatch: 
-
-env:
-  RABBITMQ_VERSION: 3.12-alpine
+  workflow_dispatch:
+    inputs:
+      rabbitmq_version:
+        description: 'RabbitMQ Version'
+        default: '3.13-alpine'
+        required: true
+        type: string
 
 jobs:
   publish:
@@ -45,7 +48,7 @@ jobs:
         file: dev/mq/Dockerfile
         platforms: linux/amd64,linux/arm64
         push: true
-        build-args: RABBITMQ_VERSION=${{ env.RABBITMQ_VERSION }}
+        build-args: RABBITMQ_VERSION=${{ inputs.rabbitmq_version }}
         tags: |
-          ghcr.io/ietf-tools/datatracker-mq:${{ env.RABBITMQ_VERSION }}
+          ghcr.io/ietf-tools/datatracker-mq:${{ inputs.rabbitmq_version }}
           ghcr.io/ietf-tools/datatracker-mq:latest

.github/workflows/build.yml

@@ -97,7 +97,7 @@ jobs:
         echo "IS_RELEASE=true" >> $GITHUB_ENV
         
     - name: Create Draft Release
-      uses: ncipollo/release-action@v1.15.0
+      uses: ncipollo/release-action@v1.16.0
       if: ${{ github.ref_name == 'release' }}
       with:
         prerelease: true
@@ -185,7 +185,7 @@ jobs:
 
     - name: Download a Coverage Results
       if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
-      uses: actions/[email protected].8
+      uses: actions/[email protected].9
       with:
         name: coverage
 
@@ -292,7 +292,7 @@ jobs:
 
     - name: Download Coverage Results
       if: ${{ github.event.inputs.skiptests == 'false' || github.ref_name == 'release' }}
-      uses: actions/[email protected].8
+      uses: actions/[email protected].9
       with:
         name: coverage
 
@@ -316,7 +316,7 @@ jobs:
         histCoveragePath: historical-coverage.json
 
     - name: Create Release
-      uses: ncipollo/release-action@v1.15.0
+      uses: ncipollo/release-action@v1.16.0
       if: ${{ env.SHOULD_DEPLOY == 'true' }}
       with:
         allowUpdates: true
@@ -329,7 +329,7 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Update Baseline Coverage
-      uses: ncipollo/release-action@v1.15.0
+      uses: ncipollo/release-action@v1.16.0
       if: ${{ github.event.inputs.updateCoverage == 'true' || github.ref_name == 'release' }}
       with:
         allowUpdates: true
@@ -407,7 +407,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Download a Release Artifact
-      uses: actions/[email protected].8
+      uses: actions/[email protected].9
       with:
         name: release-${{ env.PKG_VERSION }}
 

.github/workflows/tests-az.yml

@@ -38,7 +38,7 @@ jobs:
         ssh-keyscan -t rsa $vminfo >> ~/.ssh/known_hosts
 
     - name: Remote SSH into VM
-      uses: appleboy/ssh-action@7eaf76671a0d7eec5d98ee897acda4f968735a17
+      uses: appleboy/ssh-action@2ead5e36573f08b82fbfce1504f1a4b05a647c6f
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       with:

README.md

@@ -44,6 +44,7 @@
 
 This project is following the standard **Git Feature Workflow** development model. Learn about all the various steps of the development workflow, from creating a fork to submitting a pull request, in the [Contributing](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md) guide.
 
+> [!TIP]  
 > Make sure to read the [Styleguides](https://github.com/ietf-tools/.github/blob/main/CONTRIBUTING.md#styleguides) section to ensure a cohesive code format across the project.
 
 You can submit bug reports, enhancement and new feature requests in the [discussions](https://github.com/ietf-tools/datatracker/discussions) area. Accepted tickets will be converted to issues.
@@ -52,7 +53,8 @@ You can submit bug reports, enhancement and new feature requests in the [discuss
 
 Click the <kbd>Fork</kbd> button in the top-right corner of the repository to create a personal copy that you can work on.
 
-> Note that some GitHub Actions might be enabled by default in your fork. You should disable them by going to **Settings** > **Actions** > **General** and selecting **Disable actions** (then Save).
+> [!NOTE]  
+> Some GitHub Actions might be enabled by default in your fork. You should disable them by going to **Settings** > **Actions** > **General** and selecting **Disable actions** (then Save).
 
 #### Git Cloning Tips
 
@@ -104,7 +106,8 @@ Read the [Docker Dev Environment](docker/README.md) guide to get started.
 
 Nightly database dumps of the datatracker are available as Docker images: `ghcr.io/ietf-tools/datatracker-db:latest`  
 
-> Note that to update the database in your dev environment to the latest version, you should run the `docker/cleandb` script.
+> [!TIP]  
+> In order to update the database in your dev environment to the latest version, you should run the `docker/cleandb` script.
 
 ### Blob storage for dev/test
 
@@ -248,6 +251,7 @@ From a datatracker container, run the command:
 ./ietf/manage.py test --settings=settings_test
 ```
 
+> [!TIP]  
 > You can limit the run to specific tests using the `--pattern` argument.
 
 ### Frontend Tests
@@ -257,11 +261,13 @@ Frontend tests are done via Playwright. There're 2 different type of tests:
 - Tests that test Vue pages / components and run natively without any external dependency.
 - Tests that require a running datatracker instance to test against (usually legacy views).
 
+> [!IMPORTANT]  
 > Make sure you have Node.js 16.x or later installed on your machine.
 
 #### Run Vue Tests
 
-> :warning: All commands below **MUST** be run from the `./playwright` directory, unless noted otherwise.
+> [!WARNING]  
+> All commands below **MUST** be run from the `./playwright` directory, unless noted otherwise.
 
 1. Run **once** to install dependencies on your system:
     ```sh
@@ -294,7 +300,8 @@ Frontend tests are done via Playwright. There're 2 different type of tests:
 
 First, you need to start a datatracker instance (dev or prod), ideally from a docker container, exposing the 8000 port.
 
-> :warning: All commands below **MUST** be run from the `./playwright` directory.
+> [!WARNING]  
+> All commands below **MUST** be run from the `./playwright` directory.
 
 1. Run **once** to install dependencies on your system:
 ```sh

client/agenda/AgendaDetailsModal.vue

@@ -327,7 +327,6 @@ async function fetchSessionMaterials () {
     border-radius: 5px;
 
     .badge {
-      width: 30px;
       font-size: .7em;
       background-color: $yellow-200;
       border-bottom: 1px solid $yellow-500;

client/agenda/AgendaMobileBar.vue

@@ -124,11 +124,11 @@ const downloadIcsOptions = [
 
 function jumpToDay (dayId) {
   if (dayId === 'now') {
-    const lastEventId = agendaStore.findCurrentEventId()
-    if (lastEventId) {
-      document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
+    const nowEventId = agendaStore.findNowEventId()
+    if (nowEventId) {
+      document.getElementById(`agenda-rowid-${nowEventId}`)?.scrollIntoView(true)
     } else {
-      message.warning('There is no event happening right now.')
+      message.warning('There is no event happening right now or in the future.')
     }
   } else {
     document.getElementById(dayId)?.scrollIntoView(true)

client/agenda/AgendaQuickAccess.vue

@@ -204,12 +204,12 @@ function scrollToDay (daySlug, ev) {
 }
 
 function scrollToNow (ev) {
-  const lastEventId = agendaStore.findCurrentEventId()
+  const nowEventId = agendaStore.findNowEventId()
 
-  if (lastEventId) {
-    document.getElementById(`agenda-rowid-${lastEventId}`)?.scrollIntoView(true)
+  if (nowEventId) {
+    document.getElementById(`agenda-rowid-${nowEventId}`)?.scrollIntoView(true)
   } else {
-    message.warning('There is no event happening right now.')
+    message.warning('There is no event happening right now or in the future.')
   }
 }