Skip to content

Commit 8800f64

Browse files
Merge remote-tracking branch 'origin/dev' into v2
2 parents b363534 + a6402d9 commit 8800f64

File tree

8 files changed

+10
-8
lines changed

8 files changed

+10
-8
lines changed

.github/workflows/prepareDarwinBinariesForRelease.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@ jobs:
3737
run: |
3838
./build/build.sh ${{ env.binaryFileName }}
3939
mv ${{ env.binaryFileName }} ./build/apple_release/${{ env.binaryFileName }}.app/Contents/MacOS
40+
env:
41+
GOARCH: ${{ matrix.goarch }}
4042

4143
- name: Sign & Notarize
4244
env:

Jenkinsfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -530,7 +530,7 @@ def dockerLogin(){
530530
* The artifacts will be uploaded to Github artifacts
531531
*/
532532
def triggerDarwinBinariesSigningWorkflow() {
533-
withCredentials([string(credentialsId: 'jfrog-cli-packages-github-token', variable: "GITHUB_ACCESS_TOKEN")]) {
533+
withCredentials([string(credentialsId: 'ecosystem-github-automation', variable: "GITHUB_ACCESS_TOKEN")]) {
534534
stage("Sign MacOS binaries") {
535535
sh ('export GITHUB_ACCESS_TOKEN=$GITHUB_ACCESS_TOKEN')
536536
sh """#!/bin/bash
@@ -545,7 +545,7 @@ def triggerDarwinBinariesSigningWorkflow() {
545545
* Uploads signed darwin binaries from Github artifacts and uploads to releases
546546
*/
547547
def uploadSignedDarwinBinaries(goarch,pkg) {
548-
withCredentials([string(credentialsId: 'jfrog-cli-packages-github-token', variable: "GITHUB_ACCESS_TOKEN")]) {
548+
withCredentials([string(credentialsId: 'ecosystem-github-automation', variable: "GITHUB_ACCESS_TOKEN")]) {
549549
sh('export GITHUB_ACCESS_TOKEN=$GITHUB_ACCESS_TOKEN')
550550
sh """#!/bin/bash
551551
chmod +x ${repo}/build/apple_release/scripts/download-signed-mac-OS-binaries.sh

build/docker/slim/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
ARG repo_name_21
22
# Remove ${repo_name_21} to pull from Docker Hub.
3-
FROM ${repo_name_21}/jfrog-docker/golang:1.23.3-alpine as builder
3+
FROM ${repo_name_21}/jfrog-docker/golang:1.23.4-alpine as builder
44
ARG image_name=jfrog-cli
55
ARG cli_executable_name
66
WORKDIR /${image_name}

build/npm/v2-jf/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/npm/v2-jf/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2-jf",
3-
"version": "2.73.1",
3+
"version": "2.73.2",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

build/npm/v2/package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

build/npm/v2/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jfrog-cli-v2",
3-
"version": "2.73.1",
3+
"version": "2.73.2",
44
"description": "🐸 Command-line interface for JFrog Artifactory, Xray, Distribution, Pipelines and Mission Control 🐸",
55
"homepage": "https://github.com/jfrog/jfrog-cli",
66
"preferGlobal": true,

utils/cliutils/cli_consts.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import "time"
44

55
const (
66
// General CLI constants
7-
CliVersion = "2.73.1"
7+
CliVersion = "2.73.2"
88
ClientAgent = "jfrog-cli-go"
99

1010
// CLI base commands constants:

0 commit comments

Comments
 (0)