Skip to content

Commit e64e144

Browse files
authored
Merge pull request che-incubator#524 from tolusha/fixgenerateartfactslockyaml
fix: artifacts.lock.yaml
2 parents d2c5c8a + 1879190 commit e64e144

2 files changed

Lines changed: 7 additions & 8 deletions

File tree

build/artifacts/artifacts.lock.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@ artifacts:
1616
checksum: sha256:7361748ddf9fd09d8a2ed1f2a2d7376a2cf9aae708692820b799708385c38e08
1717
# ripgrep-ppc64le
1818
- download_url: https://github.com/microsoft/ripgrep-prebuilt/releases/download/v13.0.0-4/ripgrep-v13.0.0-4-powerpc64le-unknown-linux-gnu.tar.gz
19-
filename: ripgrep-ppc64le
19+
filename: ripgrep-v13.0.0-4-powerpc64le-unknown-linux-gnu.tar.gz
2020
checksum: sha256:3ddd7c0797c14cefd3ee61f13f15ac219bfecee8e6f6e27fd15c102ef229653a
2121
# ripgrep-s390x
2222
- download_url: https://github.com/microsoft/ripgrep-prebuilt/releases/download/v13.0.0-4/ripgrep-v13.0.0-4-s390x-unknown-linux-gnu.tar.gz
23-
filename: ripgrep-s390x
23+
filename: ripgrep-v13.0.0-4-s390x-unknown-linux-gnu.tar.gz
2424
checksum: sha256:61fa877688b721897cee33d572b64d8217ef16fe2cecf5f6f899f5ce55870e28
2525
# ripgrep-x86_64
2626
- download_url: https://github.com/microsoft/ripgrep-prebuilt/releases/download/v13.0.0-10/ripgrep-v13.0.0-10-x86_64-unknown-linux-musl.tar.gz
27-
filename: ripgrep-x86_64
27+
filename: ripgrep-v13.0.0-10-x86_64-unknown-linux-musl.tar.gz
2828
checksum: sha256:ef820a62c1d6fdc396646762ff0f0e47e127947073ed8b5aa4ceea8b61cb1659

build/artifacts/generate.sh

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ makeArtifactsLockYaml () {
5555

5656
PLATFORMS=("ppc64le" "s390x" "x86_64")
5757
for PLATFORM in "${PLATFORMS[@]}"; do
58-
FILENAME="ripgrep-$PLATFORM"
59-
6058
case $PLATFORM in
6159
'ppc64le') RG_ARCH_SUFFIX='powerpc64le-unknown-linux-gnu';;
6260
's390x') RG_ARCH_SUFFIX='s390x-unknown-linux-gnu';;
@@ -67,12 +65,13 @@ makeArtifactsLockYaml () {
6765
'x86_64') RG_VERSION="${VSIX_RIPGREP_PREBUILT_VERSION}";;
6866
esac
6967

70-
DOWNLOAD_URL="https://github.com/microsoft/ripgrep-prebuilt/releases/download/${RG_VERSION}/ripgrep-${RG_VERSION}-${RG_ARCH_SUFFIX}.tar.gz"
68+
FILENAME="ripgrep-${RG_VERSION}-${RG_ARCH_SUFFIX}.tar.gz"
69+
DOWNLOAD_URL="https://github.com/microsoft/ripgrep-prebuilt/releases/download/${RG_VERSION}/${FILENAME}"
7170
checkUrlExistence "$DOWNLOAD_URL"
7271

7372
read -r SHA256 rest <<< "$(curl -sL "$DOWNLOAD_URL" | shasum -a 256)"
7473

75-
echo " # $FILENAME" >> "$ARTIFACTS_LOCK_YAML"
74+
echo " # ripgrep-${PLATFORM}" >> "$ARTIFACTS_LOCK_YAML"
7675
echo " - download_url: $DOWNLOAD_URL" >> "$ARTIFACTS_LOCK_YAML"
7776
echo " filename: $FILENAME" >> "$ARTIFACTS_LOCK_YAML"
7877
echo " checksum: sha256:$SHA256" >> "$ARTIFACTS_LOCK_YAML"
@@ -89,7 +88,7 @@ makeAllPackageLockJson () {
8988
jq '. | del(.packages)' package-lock.json > "${ALL_PACKAGES_LOCK_JSON}"
9089

9190
# Iterate over all package-lock.json files in the project
92-
find . -name "package-lock.json" ! -path "${ALL_PACKAGES_LOCK_JSON}" | while read -r file; do
91+
find . -name "package-lock.json" -not -path "./build/*" | while read -r file; do
9392
echo "[INFO] Processing file: $file"
9493

9594
# 1. Extract packages and remove empty one

0 commit comments

Comments
 (0)