Calling bash explicitly

The paths work now, but the scripts are not set with execute permission.
I don't know if that permission will survive the transfer from my machine
across the git and runner stuff so I added an explicit call for bash instead.
This commit is contained in:
TC Johnson 2024-04-28 20:39:18 -05:00
parent 2821e4ee18
commit 6c6be00feb
No known key found for this signature in database

View File

@ -71,9 +71,9 @@ create_build_machines:
tags: tags:
- build-orchestration - build-orchestration
script: script:
- scripts/cicd/build-orchestration/build-machine-ctrl.sh create amd64-deb - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh create amd64-deb
- scripts/cicd/build-orchestration/build-machine-ctrl.sh create arm64-deb - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh create arm64-deb
- scripts/cicd/build-orchestration/build-machine-ctrl.sh create amd64-rpm - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh create amd64-rpm
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -86,7 +86,7 @@ package_amd64_deb:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-amd64-deb - earthly +package-linux-amd64-deb
- scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-to-orchestrator.sh
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -99,7 +99,7 @@ package_arm64_deb:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-arm64-deb - earthly +package-linux-arm64-deb
- scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-to-orchestrator.sh
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -112,7 +112,7 @@ package_amd64_rpm:
script: script:
- earthly bootstrap - earthly bootstrap
- earthly +package-linux-amd64-rpm - earthly +package-linux-amd64-rpm
- scripts/cicd/build-machine/scp-to-orchestrator.sh - bash scripts/cicd/build-machine/scp-to-orchestrator.sh
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -150,7 +150,7 @@ build_repositories:
SECURE_FILES_DOWNLOAD_PATH: './' SECURE_FILES_DOWNLOAD_PATH: './'
script: script:
- cp scripts/cicd/build-orchestration/generate-release.sh ~ - cp scripts/cicd/build-orchestration/generate-release.sh ~
- scripts/cicd/build-orchestration/distribute-packages.sh - bash scripts/cicd/build-orchestration/distribute-packages.sh
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -161,7 +161,7 @@ deploy_repos:
tags: tags:
- repo-server - repo-server
script: script:
- scripts/cicd/repo-server/deploy-repo.sh - bash scripts/cicd/repo-server/deploy-repo.sh
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'
@ -172,8 +172,8 @@ delete_build_machines:
tags: tags:
- build-orchestration - build-orchestration
script: script:
- /scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-deb - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-deb
- scripts/cicd/build-orchestration/build-machine-ctrl.sh delete arm64-deb - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete arm64-deb
- scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-rpm - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-rpm
rules: rules:
- if: '$CI_COMMIT_TAG =~ /v\d.+/' - if: '$CI_COMMIT_TAG =~ /v\d.+/'