diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 1f46319..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,22 +0,0 @@ -# you can delete this line if you're not using Docker -#image: busybox:latest - -shellcheck: - stage: test - image: registry.gitlab.com/pipeline-components/shellcheck:latest - variables: - CUSTOM_ENV_CI_REGISTRY: git.rockylinux.org - CUSTOM_ENV_CI_REGISTRY_USER: neil - tags: - - container - script: - # anything ending on .sh, should be shell script - - | - find . -name .git -type d -prune -o -type f -name \*.sh -print0 | - xargs -0 -P $(nproc) -r -n1 shellcheck - # magic, any file with a valid shebang should be scanned aswell - - | - find . -name .git -type d -prune -o -type f -regex '.*/[^.]*$' -print0 | - xargs -0 -P $(nproc) -r -n1 sh -c 'FILE="$0"; if head -n1 "$FILE" |grep -q "^#\\! \?/.\+\(ba|d|k\)\?sh" ; then shellcheck "$FILE" ; else /bin/true ; fi ' - - diff --git a/mangle/common.sh b/mangle/common similarity index 100% rename from mangle/common.sh rename to mangle/common diff --git a/mangle/validate_repos b/mangle/validate_repos index f34477f..e6e69fc 100755 --- a/mangle/validate_repos +++ b/mangle/validate_repos @@ -1,11 +1,11 @@ #!/usr/bin/env bash # Source mangle vars -# shellcheck source=./common.sh -source "$(dirname "$0")/common.sh" +# shellcheck source=./common +source "$(dirname "$0")/common" # Source sync / migrate vars for repository information -# shellcheck source=../sync/common.sh -source "$(dirname "$0")/../sync/common.sh" +# shellcheck source=../sync/common +source "$(dirname "$0")/../sync/common" # How many ARG1=${1} diff --git a/sync/common.sh b/sync/common similarity index 100% rename from sync/common.sh rename to sync/common diff --git a/sync/minor-release-sync-to-staging.sh b/sync/minor-release-sync-to-staging.sh index 4170acc..dccd422 100644 --- a/sync/minor-release-sync-to-staging.sh +++ b/sync/minor-release-sync-to-staging.sh @@ -3,7 +3,7 @@ # other scripts in this directory to assist. # Source common variables # shellcheck disable=SC2046,1091,1090 -source $(dirname "$0")/common.sh +source $(dirname "$0")/common # sync all pieces of a release, including extras, nfv, etc diff --git a/sync/prep-staging-8.sh b/sync/prep-staging-8.sh index 3125b24..bc7f20d 100644 --- a/sync/prep-staging-8.sh +++ b/sync/prep-staging-8.sh @@ -13,7 +13,7 @@ # Source common variables # shellcheck disable=SC2046,1091,1090 -source "$(dirname "$0")/common.sh" +source "$(dirname "$0")/common" echo "** Updating source repos" for y in "${ALL_REPOS[@]}"; do diff --git a/sync/sync-to-prod.sh b/sync/sync-to-prod.sh index 8fd918a..4edf198 100644 --- a/sync/sync-to-prod.sh +++ b/sync/sync-to-prod.sh @@ -3,7 +3,7 @@ # Source common variables # shellcheck disable=SC2046,1091,1090 -source "$(dirname "$0")/common.sh" +source "$(dirname "$0")/common" REV=${1} diff --git a/sync/sync-to-staging-sig.sh b/sync/sync-to-staging-sig.sh index e47be39..2741f19 100644 --- a/sync/sync-to-staging-sig.sh +++ b/sync/sync-to-staging-sig.sh @@ -2,7 +2,7 @@ # Source common variables # shellcheck disable=SC2046,1091,1090 -source "$(dirname "$0")/common.sh" +source "$(dirname "$0")/common" # Major Version (eg, 8) MAJ=${1} diff --git a/sync/sync-to-staging.sh b/sync/sync-to-staging.sh index 1f5438e..07d8652 100644 --- a/sync/sync-to-staging.sh +++ b/sync/sync-to-staging.sh @@ -2,7 +2,7 @@ # Source common variables # shellcheck disable=SC2046,1091,1090 -source "$(dirname "$0")/common.sh" +source "$(dirname "$0")/common" # Major Version (eg, 8) MAJ=${1}