mir/MEGAcmd
2
0
Fork 0
mirror of https://github.com/meganz/MEGAcmd synced 2025-09-03 07:15:07 +00:00
Code Issues Releases Wiki Activity

fix clone script and removed jq dependency

Browse Source 
fix macos vcpkg path
This commit is contained in:
Pablo Martin
2024-05-15 14:52:08 +02:00
parent 13ba649470
commit 7ebc082251
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build/clone_vcpkg_from_baseline.sh
View File

@@ -4,10 +4,10 @@ set -e
#Currently libuv uses a git-tree older than baseline, enforcing older commit here: #Currently libuv uses a git-tree older than baseline, enforcing older commit here:
VCPKG_OLDEST_COMMIT=293f090a9be5a88a2a77838c6346d5ef9d3df81b VCPKG_OLDEST_COMMIT=293f090a9be5a88a2a77838c6346d5ef9d3df81b
if [ -z "${VCPKG_OLDEST_COMMIT}" ]; then if [ -z ${VCPKG_OLDEST_COMMIT+x} ]; then
commit=$(jq -r '."builtin-baseline"' vcpkg.json) commit=$(grep '."builtin-baseline"' vcpkg.json | awk -F '"' '{print $(NF-1)}')
else else
commit="${VCPKG_OLDEST_COMMIT}" commit="${VCPKG_OLDEST_COMMIT}"
fi fi
commit_date=$(curl -s "https://api.github.com/repos/microsoft/vcpkg/commits/$commit" | jq -r '.commit.author.date') commit_date=$(curl -s "https://api.github.com/repos/microsoft/vcpkg/commits/$commit" | grep '"date"' | head -n 1 | awk -F '"' '{print $(NF-1)}')
git clone --shallow-since $commit_date https://github.com/microsoft/vcpkg $@ git clone --shallow-since $commit_date https://github.com/microsoft/vcpkg $@

2
jenkinsfile/Jenkinsfile_MR_macos
View File

@@ -107,7 +107,7 @@ pipeline {
environment{ environment{
PATH = "cmdinstall/bin:${env.PATH}" PATH = "cmdinstall/bin:${env.PATH}"
BUILD_DIR = "cmdbuild" BUILD_DIR = "cmdbuild"
VCPKGPATH = "/opt/vcpkg" VCPKGPATH = "${env.HOME}/jenkins/vcpkg"
} }
options{ options{
timeout(time: 3, unit: 'HOURS') timeout(time: 3, unit: 'HOURS')