From 2779e986a901f92cca1080e58643504df956c4b3 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 5 Feb 2025 12:07:12 -0500
Subject: [PATCH 1/2] ci: removes dev from triggers

---
 .azure-pipelines/ci-build.yml         |  2 --
 .github/workflows/codeql-analysis.yml |  2 +-
 .github/workflows/docker.yml          | 21 +++++++++++++++++----
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/.azure-pipelines/ci-build.yml b/.azure-pipelines/ci-build.yml
index 968286c19..ed791e58b 100644
--- a/.azure-pipelines/ci-build.yml
+++ b/.azure-pipelines/ci-build.yml
@@ -6,7 +6,6 @@ trigger:
   branches:
     include:
     - main
-    - dev
     - support/v1
   tags:
     include:
@@ -15,7 +14,6 @@ pr:
   branches:
     include:
     - main
-    - dev
     - support/v1
 variables:
   buildPlatform: 'Any CPU'
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 4224ace24..776426049 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -2,7 +2,7 @@ name: CodeQL Analysis
 
 on:
   push:
-    branches: [ main, dev ]
+    branches: [ main, support/v1 ]
   pull_request:
   schedule:
     - cron: '0 8 * * *'
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 93c8f3e87..afa87ed8d 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -2,11 +2,14 @@ name: Publish Docker image
 on:
   workflow_dispatch:
   push:
-    branches: [main, dev, support/v1]
+    tags: ["v*"]
+    branches: [main, support/v1]
     paths: ['src/Microsoft.OpenApi.Hidi/**', '.github/workflows/**']
+  pull_request:
 env:
   REGISTRY: msgraphprod.azurecr.io
   IMAGE_NAME: public/openapi/hidi
+  PREVIEW_BRANCH: "refs/heads/main"
 jobs:
   push_to_registry:
     environment:
@@ -28,14 +31,24 @@ jobs:
           echo "::set-output name=version::${version}"
         shell: pwsh
         id: getversion
+      - name: Get truncated run number
+        if: contains(github.ref, env.PREVIEW_BRANCH)
+        id: runnumber
+        run: echo "runnumber=$(echo ${{ github.run_number }} |  awk '{ print substr($0, length($0)-3, length($0)) }')" >> $GITHUB_OUTPUT
+      - name: Get current date
+        if: contains(github.ref, env.PREVIEW_BRANCH)
+        id: date
+        run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_OUTPUT
       - name: Push to registry - Nightly
-        if: ${{ github.ref == 'refs/heads/dev' }}
+        if: contains(github.ref, env.PREVIEW_BRANCH)
         uses: docker/build-push-action@v6.13.0
         with:
           push: true
-          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly
+          tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:nightly,${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.getversion.outputs.version }}-preview.${{ steps.date.outputs.date }}${{ steps.runnumber.outputs.runnumber }}
+          build-args: |
+            version_suffix=preview.${{ steps.date.outputs.date }}${{ steps.runnumber.outputs.runnumber }}
       - name: Push to registry - Release
-        if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/support/v1' }}
+        if: contains(github.ref, 'refs/tags/v')
         uses: docker/build-push-action@v6.13.0
         with:
           push: true

From 503602ef8f6da811c0135dc937794c3b3b4d29b0 Mon Sep 17 00:00:00 2001
From: Vincent Biret <vibiret@microsoft.com>
Date: Wed, 5 Feb 2025 12:09:10 -0500
Subject: [PATCH 2/2] ci: removes erroneous trigger filters

Signed-off-by: Vincent Biret <vibiret@microsoft.com>
---
 .github/workflows/docker.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index afa87ed8d..ece97b194 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,8 +3,7 @@ on:
   workflow_dispatch:
   push:
     tags: ["v*"]
-    branches: [main, support/v1]
-    paths: ['src/Microsoft.OpenApi.Hidi/**', '.github/workflows/**']
+    branches: [main]
   pull_request:
 env:
   REGISTRY: msgraphprod.azurecr.io