Merge branch 'master' into ivoanjo/prof-11385-gvl-profiling-ga

Author: ivoanjo

.github/workflows/publish.yml

@@ -119,7 +119,7 @@ jobs:
           attestations: false # PENDING decision for attestations
 
   github-release:
-    name: Attach gem to GitHub release and publish
+    name: Attach gem to Github Release and publish
     runs-on: ubuntu-24.04
     needs:
       - verify-checks
@@ -138,15 +138,127 @@ jobs:
           gh release upload "v${GEM_VERSION}" *.gem --clobber
           gh release edit "v${GEM_VERSION}" --draft=false
 
-  update-document:
+  update-gem-version:
     if: github.ref_name == 'master'
+    name: Prepare next gem version
     runs-on: ubuntu-24.04
     needs:
       - verify-checks
       - rubygems-release
+    env:
+      GEM_VERSION: ${{ needs.verify-checks.outputs.version }}
+    outputs:
+      next_version: ${{ steps.next_version.outputs.next_version }}
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          fetch-depth: 0
+      - run: bundle install
+      - id: next_version
+        run: |
+          echo "next_version=$(bundle exec rake version:next)" >> $GITHUB_OUTPUT
+
+  # https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28
+  milestone:
+    if: github.ref_name == 'master'
+    name: Open/Close Github milestones
+    runs-on: ubuntu-24.04
+    needs:
+      - verify-checks
+      - rubygems-release
+      - update-gem-version
     env:
       GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       GEM_VERSION: ${{ needs.verify-checks.outputs.version }}
+      NEXT_VERSION: ${{ needs.update-gem-version.outputs.next_version }}
+    permissions:
+      issues: write
+      pull-requests: write
+    steps:
+      - name: list milestones
+        id: milestones
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            // https://octokit.github.io/rest.js/v21/#issues-list-milestones
+            // https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28#list-milestones
+            const milestones = await github.rest.issues.listMilestones({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              state: 'open'
+            });
+            return milestones.data;
+
+      - name: Close milestone
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const milestones = ${{steps.milestones.outputs.result}}
+
+            const milestone = milestones.data.find(
+              m => m.title === process.env.GEM_VERSION
+            );
+
+            if (!milestone) {
+              console.log(`No open milestone found with version ${process.env.GEM_VERSION} - skipping close operation`);
+              return;
+            }
+
+            // https://octokit.github.io/rest.js/v21/#issues-update-milestone
+            // https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28#update-a-milestone
+            try {
+              await github.rest.issues.updateMilestone({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                milestone_number: milestone.number,
+                state: 'closed'
+              });
+              console.log(`Successfully closed milestone: ${process.env.GEM_VERSION}`);
+            } catch (error) {
+              core.setFailed(`Failed to close milestone: ${error.message}`);
+            }
+
+      - name: Create milestone
+        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
+        with:
+          script: |
+            const milestones = ${{steps.milestones.outputs.result}}
+
+            const milestone = milestones.data.find(
+              m => m.title === process.env.NEXT_VERSION
+            );
+
+            if (milestone) {
+              console.log(`Milestone "${process.env.NEXT_VERSION}" already exists - skipping creation`);
+              return;
+            }
+
+            // https://octokit.github.io/rest.js/v21/#issues-create-milestone
+            // https://docs.github.com/en/rest/issues/milestones?apiVersion=2022-11-28#create-a-milestone
+            try {
+              await github.rest.issues.createMilestone({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                title: process.env.NEXT_VERSION
+              });
+              console.log(`Successfully created milestone: ${process.env.NEXT_VERSION}`);
+            } catch (error) {
+              core.setFailed(`Failed to create milestone: ${error.message}`);
+            }
+
+  update-release-branch:
+    if: github.ref_name == 'master'
+    name: Pull request to update 'release' branch
+    runs-on: ubuntu-24.04
+    needs:
+      - verify-checks
+      - rubygems-release
+    permissions:
+      issues: write
+      pull-requests: write
+    env:
+      GITHUB_TOKEN: ${{ secrets.GHA_PAT }}
+      GEM_VERSION: ${{ needs.verify-checks.outputs.version }}
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
         with:
@@ -160,5 +272,3 @@ jobs:
             --title "Update document v${GEM_VERSION}" \
             --body "This is an auto-generated PR to update documentation from [here](${JOB_URL}). Please merge (with a merge commit) when ready." \
             --label "docs"
-
-  # TODO: Close existing milestone and create next milestone

.gitlab-ci.yml

@@ -24,8 +24,8 @@ default:
   rules:
     - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push"
       changes:
-        - .gitlab/Dockerfile-*
-      when: manual
+        - .gitlab/Dockerfile-*   # these are direct dependencies
+        - .gitlab-ci.yml         # list of images is here so it is a dependency too
       allow_failure: true
   image: $DOCKER_REGISTRY/docker:20.10.13
   parallel:
@@ -54,7 +54,13 @@ build-image-arm64:
 
 promote-image:
   stage: manual-images
-  when: manual
+  rules:                         # same as build-image
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event" || $CI_PIPELINE_SOURCE == "push"
+      changes:
+        - .gitlab/Dockerfile-*   # these are direct dependencies
+        - .gitlab-ci.yml         # list of images is here so it is a dependency too
+      when: manual               # this one is manual, but it means that install-dependencies may be hitting the wrong <base>:current til this is run
+      allow_failure: true
   tags: ["runner:docker"]
   image: $DOCKER_REGISTRY/docker:20.10.13
   parallel:
@@ -162,16 +168,11 @@ deploy_to_reliability_env:
 # Due to the constraints of Github workflow dispatch endpoint, it does not return the workflow run id.
 # https://docs.github.com/en/rest/actions/workflows?apiVersion=2022-11-28#create-a-workflow-dispatch-event
 #
-# We fetch the latest workflow run from vaccine after 5 seconds of the dispatch event.
-# False positive/negative result can happen when multiple requests are made within the same window.
-#
-# TODO:
-# Replace polling implementation with reporting status to Github with Github App. This will allow us
-# to get a deterministic result without mismatched workflow run id.
+# We fetch the latest workflow runs from vaccine then match against the run name, polling until we find it.
 vaccine:
   image: $DOCKER_REGISTRY/docker:20.10.13
   tags: [ "arch:amd64" ]
   stage: vaccine
   needs: [create-multiarch-lib-injection-image]
   script: |
-    .gitlab/scripts/vaccine.sh
+    .gitlab/scripts/vaccine.sh master "${CI_COMMIT_SHA}" "glci:${CI_PIPELINE_ID}"