From 49208cc58fe22a5b33cbbb8abd1037ce3e4238ea Mon Sep 17 00:00:00 2001 From: CI Bot Date: Thu, 9 Jan 2025 11:04:45 +0000 Subject: [PATCH] ci(shared): bump vendored ci files --- .github/workflows/check-code.yml | 4 +-- .github/workflows/vendor/rust-check-code.yml | 4 +-- ci/vendir.lock.yml | 8 ++--- ci/vendir.yml | 8 ++--- ci/vendor/pipeline-fragments.lib.yml | 36 ++------------------ 5 files changed, 14 insertions(+), 46 deletions(-) diff --git a/.github/workflows/check-code.yml b/.github/workflows/check-code.yml index cf1e1448..207b3c6c 100644 --- a/.github/workflows/check-code.yml +++ b/.github/workflows/check-code.yml @@ -15,7 +15,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v4 - name: Run the Magic Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v2 - - uses: actions/checkout@v3 + uses: DeterminateSystems/magic-nix-cache-action@v8 + - uses: actions/checkout@v4 - name: Run check code run: nix develop -c make check-code diff --git a/.github/workflows/vendor/rust-check-code.yml b/.github/workflows/vendor/rust-check-code.yml index cf1e1448..207b3c6c 100644 --- a/.github/workflows/vendor/rust-check-code.yml +++ b/.github/workflows/vendor/rust-check-code.yml @@ -15,7 +15,7 @@ jobs: - name: Install Nix uses: DeterminateSystems/nix-installer-action@v4 - name: Run the Magic Nix Cache - uses: DeterminateSystems/magic-nix-cache-action@v2 - - uses: actions/checkout@v3 + uses: DeterminateSystems/magic-nix-cache-action@v8 + - uses: actions/checkout@v4 - name: Run check code run: nix develop -c make check-code diff --git a/ci/vendir.lock.yml b/ci/vendir.lock.yml index b67d2a69..72824f27 100644 --- a/ci/vendir.lock.yml +++ b/ci/vendir.lock.yml @@ -2,14 +2,14 @@ apiVersion: vendir.k14s.io/v1alpha1 directories: - contents: - git: - commitTitle: 'fix: check-code executable' - sha: cfd07211efb7ef9c986020d1d24069c820fd1717 + commitTitle: 'Merge pull request #2 from GaloyMoney/ci--remove-slack-notification-resource...' + sha: b394897fcbaab826eb410c673325dc46aa0a720b path: . path: ../.github/workflows/vendor - contents: - git: - commitTitle: 'fix: check-code executable' - sha: cfd07211efb7ef9c986020d1d24069c820fd1717 + commitTitle: 'Merge pull request #2 from GaloyMoney/ci--remove-slack-notification-resource...' + sha: b394897fcbaab826eb410c673325dc46aa0a720b path: . path: vendor kind: LockConfig diff --git a/ci/vendir.yml b/ci/vendir.yml index 14f82bd5..1a9bb1f1 100644 --- a/ci/vendir.yml +++ b/ci/vendir.yml @@ -7,8 +7,8 @@ directories: contents: - path: . # Copy this folder out to .. git: - url: https://github.com/GaloyMoney/concourse-shared.git - ref: cfd07211efb7ef9c986020d1d24069c820fd1717 + url: https://github.com/GaloyMoney/galoy-concourse-shared.git + ref: b394897fcbaab826eb410c673325dc46aa0a720b includePaths: - shared/actions/* excludePaths: @@ -19,8 +19,8 @@ directories: contents: - path: . git: - url: https://github.com/GaloyMoney/concourse-shared.git - ref: cfd07211efb7ef9c986020d1d24069c820fd1717 + url: https://github.com/GaloyMoney/galoy-concourse-shared.git + ref: b394897fcbaab826eb410c673325dc46aa0a720b includePaths: - shared/ci/**/* excludePaths: diff --git a/ci/vendor/pipeline-fragments.lib.yml b/ci/vendor/pipeline-fragments.lib.yml index db93433d..20f323ea 100644 --- a/ci/vendor/pipeline-fragments.lib.yml +++ b/ci/vendor/pipeline-fragments.lib.yml @@ -1,11 +1,11 @@ #@ load("@ytt:data", "data") #@ def public_docker_registry(): -#@ return "us.gcr.io/galoy-org" +#@ return "us.gcr.io/galoyorg" #@ end #@ def private_docker_registry(): -#@ return "gcr.io/galoy-org" +#@ return "gcr.io/galoyorg" #@ end #@ def nodejs_concourse_image(): @@ -50,16 +50,6 @@ source: repository: nixpkgs/nix-flakes #@ end -#@ def slack_failure_notification(): -#@ fail_url = "<$ATC_EXTERNAL_URL/teams/$BUILD_TEAM_NAME/pipelines/$BUILD_PIPELINE_NAME/jobs/$BUILD_JOB_NAME/builds/$BUILD_NAME| :face_with_symbols_on_mouth: $BUILD_JOB_NAME> failed!" -put: slack -params: - channel: #@ data.values.slack_channel - username: concourse - icon_url: https://cl.ly/2F421Y300u07/concourse-logo-blue-transparent.png - text: #@ fail_url -#@ end - #@ def check_code(): name: check-code serial: true @@ -76,7 +66,6 @@ plan: - name: repo run: path: pipeline-tasks/ci/vendor/tasks/check-code.sh -on_failure: #@ slack_failure_notification() #@ end #@ def nodejs_check_code(): @@ -97,7 +86,6 @@ plan: - name: repo run: path: pipeline-tasks/ci/vendor/tasks/nodejs-check-code.sh -on_failure: #@ slack_failure_notification() #@ end #@ def rust_check_code(): @@ -119,7 +107,6 @@ plan: - path: cargo-target-dir run: path: pipeline-tasks/ci/vendor/tasks/rust-check-code.sh -on_failure: #@ slack_failure_notification() #@ end #@ def install_yarn_deps(): @@ -144,7 +131,6 @@ plan: - put: bundled-deps params: file: bundled-deps/bundled-deps-*.tgz -on_failure: #@ slack_failure_notification() #@ end #@ def test_on_docker_host(container, additional_params={}): @@ -184,7 +170,6 @@ plan: put: docker-host params: release: docker-host -on_failure: #@ slack_failure_notification() #@ end #@ def nodejs_integration_test(): @@ -215,7 +200,6 @@ plan: JEST_TIMEOUT: 90000 run: path: pipeline-tasks/ci/vendor/tasks/chart-test-integration.sh -on_failure: #@ slack_failure_notification() #@ end #@ def rust_integration_test(): @@ -246,7 +230,6 @@ plan: SSH_PUB_KEY: ((staging-ssh.ssh_public_key)) run: path: pipeline-tasks/ci/vendor/tasks/chart-test-integration.sh -on_failure: #@ slack_failure_notification() #@ end #@ def nodejs_audit(level = "high"): @@ -268,7 +251,6 @@ plan: REPO_ROOT: repo run: path: pipeline-tasks/ci/vendor/tasks/nodejs-audit.sh -on_failure: #@ slack_failure_notification() #@ end #@ def build_edge_image(): @@ -481,13 +463,6 @@ source: regexp: #@ data.values.gh_repository + "-artifacts/deps/bundled-deps-v(.*)-.*.tgz" #@ end -#@ def slack_resource(): -name: slack -type: slack-notification -source: - url: #@ data.values.slack_webhook_url -#@ end - #@ def version_resource(): name: version type: semver @@ -553,13 +528,6 @@ source: repository: frodenas/gcs-resource #@ end -#@ def slack_resource_type(): -name: slack-notification -type: docker-image -source: - repository: cfcommunity/slack-notification-resource -#@ end - #@ def npm_resource_type(): name: npm type: docker-image