Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci(shared): bump vendored ci files #593

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/check-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions .github/workflows/vendor/rust-check-code.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
8 changes: 4 additions & 4 deletions ci/vendir.lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ apiVersion: vendir.k14s.io/v1alpha1
directories:
- contents:
- git:
commitTitle: 'fix: check-code executable'
sha: cfd07211efb7ef9c986020d1d24069c820fd1717
commitTitle: 'ci: fix concourse locks git uri'
sha: 0c18d91f1b5bff905eb5e14ee3ba7f1c2db2595b
path: .
path: ../.github/workflows/vendor
- contents:
- git:
commitTitle: 'fix: check-code executable'
sha: cfd07211efb7ef9c986020d1d24069c820fd1717
commitTitle: 'ci: fix concourse locks git uri'
sha: 0c18d91f1b5bff905eb5e14ee3ba7f1c2db2595b
path: .
path: vendor
kind: LockConfig
8 changes: 4 additions & 4 deletions ci/vendir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: 0c18d91f1b5bff905eb5e14ee3ba7f1c2db2595b
includePaths:
- shared/actions/*
excludePaths:
Expand All @@ -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: 0c18d91f1b5bff905eb5e14ee3ba7f1c2db2595b
includePaths:
- shared/ci/**/*
excludePaths:
Expand Down
38 changes: 3 additions & 35 deletions ci/vendor/pipeline-fragments.lib.yml
Original file line number Diff line number Diff line change
@@ -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():
Expand Down Expand Up @@ -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
Expand All @@ -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():
Expand All @@ -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():
Expand All @@ -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():
Expand All @@ -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={}):
Expand Down Expand Up @@ -184,7 +170,6 @@ plan:
put: docker-host
params:
release: docker-host
on_failure: #@ slack_failure_notification()
#@ end

#@ def nodejs_integration_test():
Expand Down Expand Up @@ -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():
Expand Down Expand Up @@ -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"):
Expand All @@ -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():
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -540,7 +515,7 @@ source:
name: docker-host
type: pool
source:
uri: [email protected]:GaloyMoney/concourse-locks.git
uri: [email protected]:GaloyMoney/galoy-concourse-locks.git
branch: main
pool: docker-hosts
private_key: #@ data.values.github_private_key
Expand All @@ -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
Expand Down
Loading