From cd2ef8a99f2176a998422e2a1a1e8e6ff114aef3 Mon Sep 17 00:00:00 2001 From: thepetk Date: Mon, 17 Apr 2023 16:47:18 +0100 Subject: [PATCH 1/2] Update directly executed scripts on workflows Signed-off-by: thepetk --- .github/workflows/ci.yaml | 10 +++++----- .github/workflows/release-typescript-models.yaml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9060fe4c5..e9a651966 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -27,16 +27,16 @@ jobs: - name: Generate Go sources, CRDs and schemas run: | - ./docker-run.sh ./build.sh + bash ./docker-run.sh ./build.sh if [[ ! -z $(git status -s) ]] then - echo 'Command `./docker-run.sh ./build.sh` did introduce changes, which should not be the case if it had been run as part of the PR. Please run it locally and check in the results as part of your PR.' + echo 'Command `bash ./docker-run.sh ./build.sh` did introduce changes, which should not be the case if it had been run as part of the PR. Please run it locally and check in the results as part of your PR.' git --no-pager diff exit 1 fi - name: Validate samples against schemas - run: ./docker-run.sh ./validate-samples.sh + run: bash ./docker-run.sh ./validate-samples.sh - name: Run GO tests run: go test -coverprofile cover.out -v ./... @@ -45,7 +45,7 @@ jobs: uses: codecov/codecov-action@v2.1.0 - name: Check typescript model generation - run: ./build/typescript-model/generate.sh + run: bash ./build/typescript-model/generate.sh - name: Check GO mod state run: | @@ -75,7 +75,7 @@ jobs: run: | export PATH=$PATH:$(go env GOPATH)/bin go install github.com/securego/gosec/v2/cmd/gosec@v2.14.0 - ./run_gosec.sh + bash ./run_gosec.sh if [[ $? != 0 ]] then echo "gosec scanner failed to run " diff --git a/.github/workflows/release-typescript-models.yaml b/.github/workflows/release-typescript-models.yaml index 901c675ac..2831971ba 100644 --- a/.github/workflows/release-typescript-models.yaml +++ b/.github/workflows/release-typescript-models.yaml @@ -38,7 +38,7 @@ jobs: - name: Generate typescript model run: | - ./build/typescript-model/generate.sh + bash ./build/typescript-model/generate.sh cp -r ./build/typescript-model/workdir/typescript-models ../ working-directory: api From 1d99754be80ec88ddee27bfe857bc15d3f0c883a Mon Sep 17 00:00:00 2001 From: thepetk Date: Tue, 18 Apr 2023 17:01:46 +0100 Subject: [PATCH 2/2] Update directly executed scripts on bash scripts Signed-off-by: thepetk --- build.sh | 2 +- build/typescript-model/generate.sh | 2 +- make-release.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sh b/build.sh index b42b1e6e3..45dec0431 100755 --- a/build.sh +++ b/build.sh @@ -30,7 +30,7 @@ onError() { } trap 'onError' ERR -"${BASE_DIR}"/build-generator.sh +bash "${BASE_DIR}"/build-generator.sh cd "${BASE_DIR}" diff --git a/build/typescript-model/generate.sh b/build/typescript-model/generate.sh index 3b6cdc846..5fbdb006a 100755 --- a/build/typescript-model/generate.sh +++ b/build/typescript-model/generate.sh @@ -30,7 +30,7 @@ EOF echo "[INFO] Lauching gen to generate typescript files based on swagger json" export OPENAPI_SKIP_FETCH_SPEC=true export OPENAPI_GENERATOR_COMMIT="v6.3.0" - $WORK_DIR/gen/openapi/typescript.sh $WORK_DIR/typescript-models $WORK_DIR/config.sh + bash $WORK_DIR/gen/openapi/typescript.sh $WORK_DIR/typescript-models $WORK_DIR/config.sh sed -i 's/\"name\": \".*\"/"name": "@devfile\/api"/g' $WORK_DIR/typescript-models/package.json sed -i 's/\"description\": \".*\"/"description": "Typescript types for devfile api"/g' $WORK_DIR/typescript-models/package.json diff --git a/make-release.sh b/make-release.sh index b753b1801..65f8eb5b9 100755 --- a/make-release.sh +++ b/make-release.sh @@ -81,7 +81,7 @@ setVersionAndBuild() { apply_sed "s#jsonschema:version=.*#jsonschema:version=${SCHEMA_VERSION}#g" pkg/apis/workspaces/$K8S_VERSION/doc.go #src/constants.ts # Generate the schema - ./build.sh + bash ./build.sh } commitChanges() {