Merge branch 'dominik/bump-internal-ng' into dominik/test-base-branch

duckduckgo · Feb 23, 2024 · de01bd4 · de01bd4
2 parents 02e6231 + 621d999
commit de01bd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.github/workflows/publish_dmg_release.yml b/.github/workflows/publish_dmg_release.yml
@@ -45,7 +45,7 @@ jobs:
 
     name: Tag public release
 
-    if: github.event_name == 'workflow_dispatch' && github.event.inputs.release-type != 'internal'
+    if: github.event.inputs.release-type != 'internal'
 
     uses: ./.github/workflows/tag_release.yml
     with:
@@ -76,15 +76,16 @@ jobs:
     steps:
 
       - name: Download tag artifact
-        if: github.event_name == 'workflow_call'
+        id: download-tag
+        continue-on-error: true
         uses: actions/download-artifact@v4
         with:
           name: tag
           path: .github
 
       - name: Set tag variable
         run: |
-          if [[ "${{ github.event_name }}" == 'workflow_call' ]]; then
+          if [[ "${{ steps.download-tag.outcome }}" == 'success' ]]; then
             echo "tag=$(<.github/tag)" >> $GITHUB_ENV
           else
             echo "tag=${{ github.event.inputs.tag }}" >> $GITHUB_ENV

diff --git a/.github/workflows/tag_release.yml b/.github/workflows/tag_release.yml
@@ -84,11 +84,9 @@ jobs:
         github-token: ${{ github.token }}
 
     - name: Store created tag in a file artifact
-      if: github.event_name == 'workflow_call'
       run: echo ${{ steps.create-tag.outputs.tag }} > .github/tag
 
     - name: Upload tag artifact
-      if: github.event_name == 'workflow_call'
       uses: actions/upload-artifact@v4
       with:
         name: tag
@@ -132,7 +130,7 @@ jobs:
           DMG_VERSION=${PROMOTED_TAG//-/.}
         fi
         echo "WORKFLOW_URL=https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}" >> $GITHUB_ENV
-        echo "DMG_URL=${{ vars.TEST_DMG_URL_ROOT }}duckduckgo-${DMG_VERSION}.dmg" >> $GITHUB_ENV
+        echo "DMG_URL=${{ vars.DMG_URL_ROOT }}duckduckgo-${DMG_VERSION}.dmg" >> $GITHUB_ENV
         echo "RELEASE_URL=https://github.com/${{ github.repository }}/releases/tag/${TAG}" >> $GITHUB_ENV
         if [[ ${{ steps.create-tag.outputs.tag-created }} == "false" ]]; then
           last_release_tag=$(gh api /repos/${{ github.repository }}/releases/latest --jq '.tag_name')