From b32805de5a0e58d773a96a597768cdb68a18589b Mon Sep 17 00:00:00 2001 From: CI Bot Date: Thu, 2 Nov 2023 19:31:50 +0000 Subject: [PATCH] ci(shared): bump vendored ci files --- .github/workflows/audit.yml | 14 ++++++------- .github/workflows/check-code.yml | 22 +++++++++++++++++++++ ci/vendir.lock.yml | 8 ++++---- ci/vendir.yml | 4 ++-- ci/vendor/pipeline-fragments.lib.yml | 6 +++--- ci/vendor/tasks/chart-open-charts-pr.sh | 7 +++++-- ci/vendor/tasks/docker-bump-image-digest.sh | 4 +++- 7 files changed, 46 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/check-code.yml diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index 0095b9bca1..adf381d89a 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -13,10 +13,10 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - - name: Install Nix - uses: DeterminateSystems/nix-installer-action@v4 - - name: Run the Magic Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v2 - - run: cd core/api && nix develop -c pnpm install --frozen-lockfile - - name: Run check code - run: cd core/api && nix develop -c make audit + - uses: actions/setup-node@v3 + with: + node-version: 20 + cache: "yarn" + - run: yarn install --frozen-lockfile + - name: Run audit + run: make audit diff --git a/.github/workflows/check-code.yml b/.github/workflows/check-code.yml new file mode 100644 index 0000000000..4efe9f4070 --- /dev/null +++ b/.github/workflows/check-code.yml @@ -0,0 +1,22 @@ +#! Auto synced from Shared CI Resources repository +#! Don't change this file, instead change it in github.com/GaloyMoney/concourse-shared + +name: Check Code + +on: + pull_request: + branches: [main] + +jobs: + check-code: + name: Check Code + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v3 + - uses: actions/setup-node@v3 + with: + node-version: 20 + cache: "yarn" + - run: yarn install --frozen-lockfile + - name: Run check code + run: make check-code diff --git a/ci/vendir.lock.yml b/ci/vendir.lock.yml index 2e5acc07a0..8a9a64a055 100644 --- a/ci/vendir.lock.yml +++ b/ci/vendir.lock.yml @@ -2,14 +2,14 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'feat: allow public or private repo selection (#34)' - sha: 53fc9dd805d3574d200e8e6e99f856c0912b52a8 + commitTitle: 'fix: edge image resource repo (#38)' + sha: cb7ccce0f5b99eec23fbc5ce1cc0b753b58961e2 path: . path: ../.github/workflows/vendor - contents: - git: - commitTitle: 'feat: allow public or private repo selection (#34)' - sha: 53fc9dd805d3574d200e8e6e99f856c0912b52a8 + commitTitle: 'fix: edge image resource repo (#38)' + sha: cb7ccce0f5b99eec23fbc5ce1cc0b753b58961e2 path: . path: ./vendor kind: LockConfig diff --git a/ci/vendir.yml b/ci/vendir.yml index 910167653c..29a0f12e40 100644 --- a/ci/vendir.yml +++ b/ci/vendir.yml @@ -8,7 +8,7 @@ directories: - path: . # Copy this folder out to .. git: url: https://github.com/GaloyMoney/concourse-shared.git - ref: 53fc9dd805d3574d200e8e6e99f856c0912b52a8 + ref: cb7ccce0f5b99eec23fbc5ce1cc0b753b58961e2 includePaths: - shared/actions/* excludePaths: @@ -20,7 +20,7 @@ directories: - path: . git: url: https://github.com/GaloyMoney/concourse-shared.git - ref: 53fc9dd805d3574d200e8e6e99f856c0912b52a8 + ref: cb7ccce0f5b99eec23fbc5ce1cc0b753b58961e2 includePaths: - shared/ci/**/* excludePaths: diff --git a/ci/vendor/pipeline-fragments.lib.yml b/ci/vendor/pipeline-fragments.lib.yml index 8d03d6a924..a307850a6b 100644 --- a/ci/vendor/pipeline-fragments.lib.yml +++ b/ci/vendor/pipeline-fragments.lib.yml @@ -400,7 +400,7 @@ webhook_token: ((webhook.secret)) name: pipeline-tasks type: git source: - paths: [ci/vendor/*, ci/tasks/*, ci/config/*, ci/apps/tasks/*, Makefile] + paths: [ci/vendor/*, ci/tasks/*, ci/config/*, Makefile] uri: #@ data.values.git_uri branch: #@ data.values.git_branch private_key: #@ data.values.github_private_key @@ -413,14 +413,14 @@ source: tag: edge username: #@ data.values.docker_registry_user password: #@ data.values.docker_registry_password - repository: #@ public_docker_registry() if publicRepo else private_docker_registry() + "/" + data.values.gh_repository + repository: #@ public_docker_registry() + "/" + data.values.gh_repository if publicRepo else private_docker_registry() + "/" + data.values.gh_repository #@ end #@ def nodejs_deps_resource(webhook = False): name: deps type: git source: - paths: [core/api/yarn.lock] + paths: [yarn.lock] uri: #@ data.values.git_uri branch: #@ data.values.git_branch private_key: #@ data.values.github_private_key diff --git a/ci/vendor/tasks/chart-open-charts-pr.sh b/ci/vendor/tasks/chart-open-charts-pr.sh index 6acf1e03f9..4803ce427f 100755 --- a/ci/vendor/tasks/chart-open-charts-pr.sh +++ b/ci/vendor/tasks/chart-open-charts-pr.sh @@ -6,12 +6,15 @@ set -eu export digest=$(cat ./edge-image/digest) +export ref=$(cat ./repo/.git/short_ref) pushd charts-repo -ref=$(yq e '.image.git_ref' charts/${CHARTS_SUBDIR}/values.yaml) git checkout ${BRANCH} -old_ref=$(yq e '.image.git_ref' charts/${CHARTS_SUBDIR}/values.yaml) + +old_digest=$(yq e '.image.digest' "./charts/${CHARTS_SUBDIR}/values.yaml") +old_ref=$(grep "digest: \"${old_digest}\"" "./charts/${CHARTS_SUBDIR}/values.yaml" \ + | sed -n 's/.*commit_ref=\([^;]*\);.*/\1/p' | tr -d ' \n') cat <> ../body.md # Bump ${CHARTS_SUBDIR} image diff --git a/ci/vendor/tasks/docker-bump-image-digest.sh b/ci/vendor/tasks/docker-bump-image-digest.sh index f47ad5229e..2616b7bc99 100755 --- a/ci/vendor/tasks/docker-bump-image-digest.sh +++ b/ci/vendor/tasks/docker-bump-image-digest.sh @@ -12,7 +12,9 @@ export app_version=$(cat version/version) pushd charts-repo yq -i e '.image.digest = strenv(digest)' ./charts/${CHARTS_SUBDIR}/values.yaml -yq -i e '.image.git_ref = strenv(ref)' ./charts/${CHARTS_SUBDIR}/values.yaml + +sed -i "s|\(digest: \"${digest}\"\).*$|\1 # METADATA:: repository=https://github.com/GaloyMoney/${CHARTS_SUBDIR};commit_ref=${ref};app=${CHARTS_SUBDIR};|g" "./charts/${CHARTS_SUBDIR}/values.yaml" + yq -i e '.appVersion = strenv(app_version)' ./charts/${CHARTS_SUBDIR}/Chart.yaml if [[ -z $(git config --global user.email) ]]; then