diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-09 08:26:49 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-11-09 08:26:49 +0000 |
commit | 557d39be2a575c8a340ead48af2fc6e709d52a00 (patch) | |
tree | 5f0b3a62a1a0ff8eedf21d5f06ffab03dfac2785 /.github | |
parent | Releasing debian version 1.47.2-1. (diff) | |
download | netdata-557d39be2a575c8a340ead48af2fc6e709d52a00.tar.xz netdata-557d39be2a575c8a340ead48af2fc6e709d52a00.zip |
Merging upstream version 1.47.5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to '.github')
-rw-r--r-- | .github/data/distros.yml | 2 | ||||
-rw-r--r-- | .github/workflows/build.yml | 10 | ||||
-rw-r--r-- | .github/workflows/packaging.yml | 9 |
3 files changed, 11 insertions, 10 deletions
diff --git a/.github/data/distros.yml b/.github/data/distros.yml index 54083ca57..2c5569bff 100644 --- a/.github/data/distros.yml +++ b/.github/data/distros.yml @@ -6,7 +6,7 @@ platform_map: # map packaging architectures to docker platforms arm64: linux/arm64/v8 armhf: linux/arm/v7 armhfp: linux/arm/v7 - i386: linux/i386 + i386: linux/386 x86_64: linux/amd64 arch_order: # sort order for per-architecture jobs in CI - amd64 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 073d85b7a..3a253c0cc 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -151,7 +151,7 @@ jobs: - name: Store id: store if: needs.file-check.outputs.run == 'true' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.4.2 with: name: dist-tarball path: artifacts/*.tar.gz @@ -245,7 +245,7 @@ jobs: - name: Store id: store if: needs.file-check.outputs.run == 'true' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.4.2 with: name: dist-static-${{ matrix.arch }} path: artifacts/*.gz.run @@ -321,7 +321,7 @@ jobs: - name: Store Artifacts id: store if: needs.file-check.outputs.run == 'true' - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.4.2 with: name: final-artifacts path: artifacts/* @@ -862,7 +862,7 @@ jobs: tags: test:${{ matrix.artifact_key }} - name: Upload image artifact id: upload - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.4.2 with: name: ${{ matrix.artifact_key }}-test-env path: /tmp/image.tar @@ -1120,7 +1120,7 @@ jobs: timestamp-digest: SHA256 - name: Upload Installer id: upload - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.4.2 with: name: windows-x86_64-installer path: packaging\windows\netdata-installer.exe diff --git a/.github/workflows/packaging.yml b/.github/workflows/packaging.yml index bba552df7..7cf472707 100644 --- a/.github/workflows/packaging.yml +++ b/.github/workflows/packaging.yml @@ -256,15 +256,16 @@ jobs: shell: bash run: | docker run --security-opt seccomp=unconfined -e DISABLE_TELEMETRY=1 -e VERSION=${{ needs.version-check.outputs.version }} \ - -e ENABLE_SENTRY=${{ matrix.bundle_sentry }} -e RELEASE_PIPELINE=${{ env.RELEASE_PIPELINE }} \ - -e BUILD_DESTINATION=${{ matrix.distro }}${{ matrix.version }}_${{ matrix.arch }} -e UPLOAD_SENTRY=${{ env.UPLOAD_SENTRY }} \ - -e SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_CLI_TOKEN }} -e NETDATA_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ + -e ENABLE_SENTRY=${{ matrix.bundle_sentry }} -e RELEASE_PIPELINE=${{ env.RELEASE_PIPELINE }} \ + -e BUILD_DESTINATION=${{ matrix.distro }}${{ matrix.version }}_${{ matrix.arch }} -e UPLOAD_SENTRY=${{ env.UPLOAD_SENTRY }} \ + -e SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_CLI_TOKEN }} -e NETDATA_SENTRY_DSN=${{ secrets.SENTRY_DSN }} \ + -e GOOS=$(echo ${{ matrix.platform }} | cut -f 1 -d '/') -e GOARCH=$(echo ${{ matrix.platform }} | cut -f 2 -d '/') \ --platform=${{ matrix.platform }} -v "$PWD":/netdata netdata/package-builders:${{ matrix.distro }}${{ matrix.version }}-${{ matrix.builder_rev }} - name: Save Packages id: artifacts if: needs.file-check.outputs.run == 'true' continue-on-error: true - uses: actions/upload-artifact@v4 + uses: actions/upload-artifact@v4.4.2 with: name: ${{ matrix.distro }}-${{ matrix.version }}-${{ matrix.arch }}-packages path: ${{ github.workspace }}/artifacts/* |