diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 9c5e6db..2dda4ba 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -32,11 +32,6 @@ jobs: - run: ./build.sh release -c name: Release - - uses: actions/upload-artifact@v4 - with: - name: elastic-distribution - path: ${{ env.RELEASE_DISTRO }} - - name: Generate build provenance (Distribution) uses: actions/attest-build-provenance@5e9cb68e95676991667494a6a4e59b8a2f13e1d0 # v1.3.3 with: @@ -47,7 +42,6 @@ jobs: with: subject-path: "${{ github.workspace }}/${{ env.RELEASE_PACKAGES }}" - # Push to feedz.io - name: publish canary packages to feedz.io run: dotnet nuget push '${{ env.RELEASE_PACKAGES }}' -k ${{ secrets.FEEDZ_IO_API_KEY }} -s ${{ secrets.FEEDZ_IO_API_URL }} --skip-duplicate --no-symbols diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3ed0fdf..ff5e4fe 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -35,21 +35,22 @@ jobs: - run: ./build.sh release name: Release - - name: Attach Distribution to release - env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - gh release upload ${{ github.ref_name }} "${{ env.RELEASE_DISTRO }}" - - name: Generate build provenance (Distribution) uses: actions/attest-build-provenance@5e9cb68e95676991667494a6a4e59b8a2f13e1d0 # v1.3.3 with: - subject-path: "${{ github.workspace }}/${{ env.RELASE_DISTRO }}" + subject-path: "${{ github.workspace }}/${{ env.RELEASE_DISTRO }}" - name: Generate build provenance (Packages) uses: actions/attest-build-provenance@5e9cb68e95676991667494a6a4e59b8a2f13e1d0 # v1.3.3 with: subject-path: "${{ github.workspace }}/${{ env.RELEASE_PACKAGES }}" + + - name: Attach Distribution to release + if: ${{ github.event_name == 'release' }} + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + gh release upload ${{ github.ref_name }} '${{ env.RELEASE_DISTRO }}' - name: Release to Nuget (only for release events) if: ${{ github.event_name == 'release' }} diff --git a/build/scripts/Packaging.fs b/build/scripts/Packaging.fs index a29d775..c0eb924 100644 --- a/build/scripts/Packaging.fs +++ b/build/scripts/Packaging.fs @@ -129,7 +129,7 @@ let stageInstrumentationScript (stagedZips:List) = let wrapperScript = downloadFileInfo "instrument.sh" let copyScript = Path.Combine("src", "Elastic.OpenTelemetry.AutoInstrumentation", "instrument.sh") |> FileInfo let script = copyScript.CopyTo(wrapperScript.FullName, true) - (stageVersion, script) + (stageScript, script) let stageInstallationBashScript () = let installScript = downloadFileInfo "otel-dotnet-auto-install.sh"