Merge pull request #256 from Azure/build-workflow-fix11

Azure IPAM Build Workflow Fixes
Azure · Apr 9, 2024 · 72dace5 · 72dace5
2 parents fd7bf44 + e0ba53a
commit 72dace5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/azure-ipam-build.yml b/.github/workflows/azure-ipam-build.yml
@@ -22,6 +22,7 @@ jobs:
     outputs:
       ipamVersion: ${{ steps.updateVersion.outputs.ipamVersion }}
       prNumber: ${{ fromJson(steps.getPullRequestData.outputs.result).number }}
+      commitHash: ${{ steps.commitCode.outputs.commitHash }}
     steps:
       - run: echo "Job triggered by a ${{ github.event_name }} event to main."
 
@@ -103,6 +104,7 @@ jobs:
         run: |
           git commit -a -m "Updated Azure IPAM Version to v${{ steps.updateVersion.outputs.ipamVersion }} [skip ci]"
           git push
+          echo "commitHash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
 
   release:
     name: Create Azure IPAM Release
@@ -112,6 +114,7 @@ jobs:
       - name: Checkout Azure IPAM Code
         uses: actions/checkout@v4
         with:
+          ref: ${{ needs.version.outputs.commitHash }}
           sparse-checkout: |
             assets
 
@@ -141,7 +144,7 @@ jobs:
     needs: [ version, release ]
     steps:
       - name: Azure login
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}

diff --git a/docs/_coverpage.md b/docs/_coverpage.md
@@ -2,7 +2,7 @@
 
 ![logo](./images/ipam-logo.png ':size=45%')
 
-# IPAM <small>3.1.0</small>
+# IPAM <small>3.0.0</small>
 > Azure IP Address Management Made Easy
 
 [GitHub](https://github.com/Azure/ipam)

diff --git a/engine/app/version.json b/engine/app/version.json
@@ -1,3 +1,3 @@
 {
-  "version": "3.1.0"
+  "version": "3.0.0"
 }
diff --git a/ui/package.json b/ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "azure-ipam-ui",
-  "version": "3.1.0",
+  "version": "3.0.0",
   "type": "module",
   "private": true,
   "dependencies": {