From 6c6be00feb5a4b3e82d7095d9e4494e16017258b Mon Sep 17 00:00:00 2001 From: TC Johnson Date: Sun, 28 Apr 2024 20:39:18 -0500 Subject: [PATCH] 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. --- .gitlab-ci.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 020d1b60..c16d688b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -71,9 +71,9 @@ create_build_machines: tags: - build-orchestration script: - - scripts/cicd/build-orchestration/build-machine-ctrl.sh create amd64-deb - - 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-deb + - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh create arm64-deb + - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh create amd64-rpm rules: - if: '$CI_COMMIT_TAG =~ /v\d.+/' @@ -86,7 +86,7 @@ package_amd64_deb: script: - earthly bootstrap - earthly +package-linux-amd64-deb - - scripts/cicd/build-machine/scp-to-orchestrator.sh + - bash scripts/cicd/build-machine/scp-to-orchestrator.sh rules: - if: '$CI_COMMIT_TAG =~ /v\d.+/' @@ -99,7 +99,7 @@ package_arm64_deb: script: - earthly bootstrap - earthly +package-linux-arm64-deb - - scripts/cicd/build-machine/scp-to-orchestrator.sh + - bash scripts/cicd/build-machine/scp-to-orchestrator.sh rules: - if: '$CI_COMMIT_TAG =~ /v\d.+/' @@ -112,7 +112,7 @@ package_amd64_rpm: script: - earthly bootstrap - earthly +package-linux-amd64-rpm - - scripts/cicd/build-machine/scp-to-orchestrator.sh + - bash scripts/cicd/build-machine/scp-to-orchestrator.sh rules: - if: '$CI_COMMIT_TAG =~ /v\d.+/' @@ -150,7 +150,7 @@ build_repositories: SECURE_FILES_DOWNLOAD_PATH: './' script: - cp scripts/cicd/build-orchestration/generate-release.sh ~ - - scripts/cicd/build-orchestration/distribute-packages.sh + - bash scripts/cicd/build-orchestration/distribute-packages.sh rules: - if: '$CI_COMMIT_TAG =~ /v\d.+/' @@ -161,7 +161,7 @@ deploy_repos: tags: - repo-server script: - - scripts/cicd/repo-server/deploy-repo.sh + - bash scripts/cicd/repo-server/deploy-repo.sh rules: - if: '$CI_COMMIT_TAG =~ /v\d.+/' @@ -172,8 +172,8 @@ delete_build_machines: tags: - build-orchestration script: - - /scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-deb - - 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-deb + - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete arm64-deb + - bash scripts/cicd/build-orchestration/build-machine-ctrl.sh delete amd64-rpm rules: - if: '$CI_COMMIT_TAG =~ /v\d.+/'