diff --git a/.github/workflows/prepareDarwinBinariesForRelease.yml b/.github/workflows/prepareDarwinBinariesForRelease.yml index 7a977bdbc..5f474c9a1 100644 --- a/.github/workflows/prepareDarwinBinariesForRelease.yml +++ b/.github/workflows/prepareDarwinBinariesForRelease.yml @@ -37,6 +37,8 @@ jobs: run: | ./build/build.sh ${{ env.binaryFileName }} mv ${{ env.binaryFileName }} ./build/apple_release/${{ env.binaryFileName }}.app/Contents/MacOS + env: + GOARCH: ${{ matrix.goarch }} - name: Sign & Notarize env: diff --git a/Jenkinsfile b/Jenkinsfile index c559b8639..03dac1f4e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -530,7 +530,7 @@ def dockerLogin(){ * The artifacts will be uploaded to Github artifacts */ def triggerDarwinBinariesSigningWorkflow() { - withCredentials([string(credentialsId: 'jfrog-cli-packages-github-token', variable: "GITHUB_ACCESS_TOKEN")]) { + withCredentials([string(credentialsId: 'ecosystem-github-automation', variable: "GITHUB_ACCESS_TOKEN")]) { stage("Sign MacOS binaries") { sh ('export GITHUB_ACCESS_TOKEN=$GITHUB_ACCESS_TOKEN') sh """#!/bin/bash @@ -545,7 +545,7 @@ def triggerDarwinBinariesSigningWorkflow() { * Uploads signed darwin binaries from Github artifacts and uploads to releases */ def uploadSignedDarwinBinaries(goarch,pkg) { - withCredentials([string(credentialsId: 'jfrog-cli-packages-github-token', variable: "GITHUB_ACCESS_TOKEN")]) { + withCredentials([string(credentialsId: 'ecosystem-github-automation', variable: "GITHUB_ACCESS_TOKEN")]) { sh('export GITHUB_ACCESS_TOKEN=$GITHUB_ACCESS_TOKEN') sh """#!/bin/bash chmod +x ${repo}/build/apple_release/scripts/download-signed-mac-OS-binaries.sh diff --git a/build/docker/slim/Dockerfile b/build/docker/slim/Dockerfile index a915326c2..131e51a32 100644 --- a/build/docker/slim/Dockerfile +++ b/build/docker/slim/Dockerfile @@ -1,6 +1,6 @@ ARG repo_name_21 # Remove ${repo_name_21} to pull from Docker Hub. -FROM ${repo_name_21}/jfrog-docker/golang:1.23.3-alpine as builder +FROM ${repo_name_21}/jfrog-docker/golang:1.23.4-alpine as builder ARG image_name=jfrog-cli ARG cli_executable_name WORKDIR /${image_name}