Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix release #2843

Merged
merged 5 commits into from
Jan 23, 2025
Merged

Fix release #2843

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6cc0129
Update github token
EyalDelarea Jan 23, 2025
cf46336
Update docker image
EyalDelarea Jan 23, 2025
7bed664
Update macos goarch
EyalDelarea Jan 23, 2025
a983402
Update macos goarch
EyalDelarea Jan 23, 2025
5203faf
Merge branch 'dev' of https://github.com/jfrog/jfrog-cli into update_…
EyalDelarea Jan 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion build/docker/slim/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
Loading