From c7bfeb584c826199f755f5f956407af6eaec0754 Mon Sep 17 00:00:00 2001 From: Eyal Delarea Date: Thu, 23 Jan 2025 13:07:16 +0200 Subject: [PATCH 1/2] Fix release (#2843) --- .github/workflows/prepareDarwinBinariesForRelease.yml | 2 ++ Jenkinsfile | 4 ++-- build/docker/slim/Dockerfile | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) 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} From a6402d90a312f044f47805e1f6bd11758d82d05b Mon Sep 17 00:00:00 2001 From: Eyal Delarea Date: Thu, 23 Jan 2025 13:11:12 +0200 Subject: [PATCH 2/2] Bump version from 2.73.1 to 2.73.2 (#2844) --- build/npm/v2-jf/package-lock.json | 2 +- build/npm/v2-jf/package.json | 2 +- build/npm/v2/package-lock.json | 2 +- build/npm/v2/package.json | 2 +- utils/cliutils/cli_consts.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build/npm/v2-jf/package-lock.json b/build/npm/v2-jf/package-lock.json index 0f3b7382c..7c41066e6 100644 --- a/build/npm/v2-jf/package-lock.json +++ b/build/npm/v2-jf/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.73.1", + "version": "2.73.2", "lockfileVersion": 1 } diff --git a/build/npm/v2-jf/package.json b/build/npm/v2-jf/package.json index c28b14d14..06ef26cd7 100644 --- a/build/npm/v2-jf/package.json +++ b/build/npm/v2-jf/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2-jf", - "version": "2.73.1", + "version": "2.73.2", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/build/npm/v2/package-lock.json b/build/npm/v2/package-lock.json index 8b2298fce..15137c43a 100644 --- a/build/npm/v2/package-lock.json +++ b/build/npm/v2/package-lock.json @@ -1,5 +1,5 @@ { "name": "jfrog-cli-v2", - "version": "2.73.1", + "version": "2.73.2", "lockfileVersion": 2 } diff --git a/build/npm/v2/package.json b/build/npm/v2/package.json index 1b9e53702..23d144c2e 100644 --- a/build/npm/v2/package.json +++ b/build/npm/v2/package.json @@ -1,6 +1,6 @@ { "name": "jfrog-cli-v2", - "version": "2.73.1", + "version": "2.73.2", "description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸", "homepage": "https://github.com/jfrog/jfrog-cli", "preferGlobal": true, diff --git a/utils/cliutils/cli_consts.go b/utils/cliutils/cli_consts.go index 780a07df5..626bf7eaa 100644 --- a/utils/cliutils/cli_consts.go +++ b/utils/cliutils/cli_consts.go @@ -4,7 +4,7 @@ import "time" const ( // General CLI constants - CliVersion = "2.73.1" + CliVersion = "2.73.2" ClientAgent = "jfrog-cli-go" // CLI base commands constants: