Merge pull request #237 from vania-pooh/master

More recent checkout action
aerokube · Dec 20, 2023 · f4a820a · f4a820a
2 parents 5965778 + 070f58b
commit f4a820a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'aerokube/charts'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Test
         run: ci/test.sh

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     if: github.repository == 'aerokube/charts'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: Test
         run: ci/test.sh

diff --git a/ci/build.sh b/ci/build.sh
@@ -24,15 +24,18 @@ for package in moon moon2 browser-ops license-ops boot; do
 done
 cd "$output_dir"
 if [ -n "$regenerate" ] && [ "$regenerate" = "true" ]; then
+  echo "Regenerating manifest from S3 objects"
   regenerateDir="regenerate"
   mkdir -p "$regenerateDir"
   pushd "$regenerateDir"
-  aws s3 cp "s3://$S3_BUCKET_NAME" . --endpoint="$S3_ENDPOINT"
+  keys="$path/*.tgz"
+  aws s3 cp "s3://$S3_BUCKET_NAME$keys" . --endpoint="$S3_ENDPOINT"
   helm repo index . --url "$CHARTS_REPO"
   popd
-  cp regenerate/index.yaml .
+  cp "$regenerateDir"/index.yaml .
   rm -Rf "$regenerateDir"
 else
+  echo "Merging manifest"
   wget -O index.yaml "$CHARTS_REPO"index.yaml
 fi
 helm repo index . --url "$CHARTS_REPO" --merge index.yaml