diff --git a/.github/workflows/compliance_check.yml b/.github/workflows/compliance_check.yml index 7eb53f082dd6aa22e60248acac1fd18529db3b26..bf641e4f5d3b98ec49b942c31432ce55c8801bed 100644 --- a/.github/workflows/compliance_check.yml +++ b/.github/workflows/compliance_check.yml @@ -41,12 +41,12 @@ jobs: LATEST_TAG: ${{ steps.determine-version.outputs.tag }} GITHUB_APP_ID: ${{ secrets.ZED_ZIPPY_APP_ID }} GITHUB_APP_KEY: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }} - - name: '@actions/upload-artifact compliance-report-${GITHUB_REF_NAME}.md' + - name: '@actions/upload-artifact compliance-report-${{ github.ref_name }}.md' if: always() uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: - name: compliance-report-${GITHUB_REF_NAME}.md - path: compliance-report-${GITHUB_REF_NAME}.md + name: compliance-report-${{ github.ref_name }}.md + path: compliance-report-${{ github.ref_name }}.md if-no-files-found: error - name: send_compliance_slack_notification if: always() diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e40c9f68b5f79c19238fd08da0b73919734f8fa4..7578ab9c722922e18faa66b7545dfc059249e3c5 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -314,12 +314,12 @@ jobs: GITHUB_APP_ID: ${{ secrets.ZED_ZIPPY_APP_ID }} GITHUB_APP_KEY: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }} continue-on-error: true - - name: '@actions/upload-artifact compliance-report-${GITHUB_REF_NAME}.md' + - name: '@actions/upload-artifact compliance-report-${{ github.ref_name }}.md' if: always() uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: - name: compliance-report-${GITHUB_REF_NAME}.md - path: compliance-report-${GITHUB_REF_NAME}.md + name: compliance-report-${{ github.ref_name }}.md + path: compliance-report-${{ github.ref_name }}.md if-no-files-found: error - name: send_compliance_slack_notification if: always() @@ -680,12 +680,12 @@ jobs: GITHUB_APP_ID: ${{ secrets.ZED_ZIPPY_APP_ID }} GITHUB_APP_KEY: ${{ secrets.ZED_ZIPPY_APP_PRIVATE_KEY }} continue-on-error: true - - name: '@actions/upload-artifact compliance-report-${GITHUB_REF_NAME}.md' + - name: '@actions/upload-artifact compliance-report-${{ github.ref_name }}.md' if: always() uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 with: - name: compliance-report-${GITHUB_REF_NAME}.md - path: compliance-report-${GITHUB_REF_NAME}.md + name: compliance-report-${{ github.ref_name }}.md + path: compliance-report-${{ github.ref_name }}.md if-no-files-found: error overwrite: true - name: send_compliance_slack_notification diff --git a/tooling/xtask/src/tasks/workflows/release.rs b/tooling/xtask/src/tasks/workflows/release.rs index 5a33cc911b5d940b2d52e93568c5f4e5c53a0898..dda19d45e01982a857a384916b0c6345c8aad8fd 100644 --- a/tooling/xtask/src/tasks/workflows/release.rs +++ b/tooling/xtask/src/tasks/workflows/release.rs @@ -152,6 +152,8 @@ pub(crate) fn create_sentry_release() -> Step { } pub(crate) const COMPLIANCE_REPORT_PATH: &str = "compliance-report-${GITHUB_REF_NAME}.md"; +pub(crate) const COMPLIANCE_REPORT_ARTIFACT_PATH: &str = + "compliance-report-${{ github.ref_name }}.md"; pub(crate) const COMPLIANCE_STEP_ID: &str = "run-compliance-check"; const NEEDS_REVIEW_PULLS_URL: &str = "https://github.com/zed-industries/zed/pulls?q=is%3Apr+is%3Aclosed+label%3A%22PR+state%3Aneeds+review%22"; @@ -165,7 +167,7 @@ pub(crate) fn add_compliance_notification_steps( job: gh_workflow::Job, context: ComplianceContext, ) -> gh_workflow::Job { - let upload_step = upload_artifact(COMPLIANCE_REPORT_PATH) + let upload_step = upload_artifact(COMPLIANCE_REPORT_ARTIFACT_PATH) .if_condition(Expression::new("always()")) .when(matches!(context, ComplianceContext::Release), |step| { step.add_with(("overwrite", true))