diff --git a/.github/workflows/quickstart.yml b/.github/workflows/quickstart.yml index 5f5587e6d9..a8bd45bf7d 100644 --- a/.github/workflows/quickstart.yml +++ b/.github/workflows/quickstart.yml @@ -19,7 +19,7 @@ jobs: - name: Test quickstart run: | cd quickstart - ./bin/bump-galoy-git-ref.sh ${{ github.event.pull_request.head.sha }} + ./bin/bump-galoy-git-ref.sh ${{ github.event.pull_request.head.sha }} ${{ github.event.pull_request.head.repo.clone_url }} ./bin/bump-galoy-image-digest.sh api local ./bin/bump-galoy-image-digest.sh trigger local ./bin/bump-mongodb-migrate-image-digest.sh local diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000000..f7a0a03c78 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,14 @@ +coverage +dist +tmp +charts +protos +.vscode +quickstart + +.github +ci/**/* + +**/*.md +**/*.yaml +**/*.yml diff --git a/quickstart/bin/bump-galoy-git-ref.sh b/quickstart/bin/bump-galoy-git-ref.sh index d1bc9e8a19..65ea6d1bfd 100755 --- a/quickstart/bin/bump-galoy-git-ref.sh +++ b/quickstart/bin/bump-galoy-git-ref.sh @@ -1,4 +1,6 @@ #!/bin/bash +git_ref_sha="${1}" +git_url="${2}" DIR="$(dirname "$(readlink -f "$BASH_SOURCE")")" @@ -6,6 +8,8 @@ TMPDIR="" TMPDIR=$(mktemp -d -t repipe.XXXXXX) trap "rm -rf ${TMPDIR}" INT TERM QUIT EXIT -sed "s/^galoy_git_ref:.*/galoy_git_ref: ${1}/" ${DIR}/../vendir/values.yml > ${TMPDIR}/new_values.yml +sed "s|^galoy_git_ref:.*|galoy_git_ref: ${git_ref_sha}|" ${DIR}/../vendir/values.yml > ${TMPDIR}/new_values.yml +mv ${TMPDIR}/new_values.yml ${DIR}/../vendir/values.yml +sed "s|^galoy_repo_url:.*|galoy_repo_url: ${git_url}|" ${DIR}/../vendir/values.yml > ${TMPDIR}/new_values.yml mv ${TMPDIR}/new_values.yml ${DIR}/../vendir/values.yml diff --git a/quickstart/vendir/template.yml b/quickstart/vendir/template.yml index 3eee178f05..1d838be702 100644 --- a/quickstart/vendir/template.yml +++ b/quickstart/vendir/template.yml @@ -8,7 +8,7 @@ directories: contents: - path: ./ git: - url: https://github.com/GaloyMoney/galoy.git + url: #@ data.values.galoy_repo_url ref: #@ data.values.galoy_git_ref includePaths: - core/api/dev/**/* @@ -20,7 +20,7 @@ directories: contents: - path: ./ git: - url: https://github.com/GaloyMoney/galoy.git + url: #@ data.values.galoy_repo_url ref: #@ data.values.galoy_git_ref includePaths: - core/api/dev/**/* @@ -38,7 +38,7 @@ directories: contents: - path: ./ git: - url: https://github.com/GaloyMoney/galoy.git + url: #@ data.values.galoy_repo_url ref: #@ data.values.galoy_git_ref includePaths: - core/api/src/graphql/public/schema.graphql diff --git a/quickstart/vendir/values.yml b/quickstart/vendir/values.yml index 3af41c0818..57c8779090 100644 --- a/quickstart/vendir/values.yml +++ b/quickstart/vendir/values.yml @@ -1,3 +1,4 @@ #@data/values --- galoy_git_ref: 955b193d1028d7e34c63ef198e619168399ba098 +galoy_repo_url: https://github.com/GaloyMoney/galoy.git