one more try

grafana · Apr 5, 2024 · e01fd55 · e01fd55
1 parent e6450ea
commit e01fd55
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,7 +15,6 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GRAFANA_ACCESS_POLICY_TOKEN: ${{ secrets.GRAFANA_ACCESS_POLICY_TOKEN }}
-      BRANCH_NAME: ${{ github.head_ref || github.ref_name }}
     outputs:
       plugin-id: ${{ steps.metadata.outputs.plugin-id }}
       archive: ${{ steps.metadata.outputs.archive }}
@@ -105,7 +104,7 @@ jobs:
           sudo apt-get install jq
 
           export GRAFANA_PLUGIN_ID=$(cat dist/plugin.json | jq -r .id)
-          export GRAFANA_PLUGIN_ARTIFACT=${GRAFANA_PLUGIN_ID}-${BRANCH_NAME}.zip
+          export GRAFANA_PLUGIN_ARTIFACT=${GRAFANA_PLUGIN_ID}-${GITHUB_HEAD_REF:-${GITHUB_REF#refs/heads/}}.zip
 
           echo "plugin-id=${GRAFANA_PLUGIN_ID}" >> $GITHUB_OUTPUT
           echo "archive=${GRAFANA_PLUGIN_ARTIFACT}" >> $GITHUB_OUTPUT

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -21,6 +21,6 @@ jobs:
         name: 'Upload assets to main'
         uses: 'google-github-actions/upload-cloud-storage@v1'
         with:
-          path: ${{ needs.build.outputs.archive }}
+          path: ./${{ needs.build.outputs.archive }}
           destination: 'integration-artifacts/grafana-exploretraces-app/'
           parent: false