diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml index 2aea10a..219174f 100644 --- a/.github/workflows/continuous-integration.yml +++ b/.github/workflows/continuous-integration.yml @@ -30,8 +30,8 @@ jobs: uses: actions/checkout@v3 - name: Check formatting. run: earthly --ci +check-go-formatting - sh-formatting: - name: Sh Formatting + shell-formatting: + name: Shell Formatting runs-on: ubuntu-latest steps: - name: Download Earthly v0.7.17. @@ -39,7 +39,7 @@ jobs: - name: Checkout code. uses: actions/checkout@v3 - name: Check formatting. - run: earthly --ci +check-sh-formatting + run: earthly --ci +check-shell-formatting yaml-formatting: name: YAML Formatting runs-on: ubuntu-latest @@ -60,8 +60,8 @@ jobs: uses: actions/checkout@v3 - name: Check linting. run: earthly --ci +check-go-linting - sh-linting: - name: Sh Linting + shell-linting: + name: Shell Linting runs-on: ubuntu-latest steps: - name: Download Earthly v0.7.17. @@ -69,7 +69,7 @@ jobs: - name: Checkout code. uses: actions/checkout@v3 - name: Check linting. - run: earthly --ci +check-sh-linting + run: earthly --ci +check-shell-linting modules: name: Modules runs-on: ubuntu-latest diff --git a/Earthfile b/Earthfile index b103c4d..9fbf34f 100644 --- a/Earthfile +++ b/Earthfile @@ -84,9 +84,9 @@ sh-formatting-base: DO +COPY_CI_DATA -check-sh-formatting: +check-shell-formatting: FROM +sh-formatting-base - RUN ./ci/check-sh-formatting.sh + RUN ./ci/check-shell-formatting.sh yaml-formatting-base: @@ -103,7 +103,7 @@ check-yaml-formatting: check-formatting: BUILD +check-go-formatting - BUILD +check-sh-formatting + BUILD +check-shell-formatting BUILD +check-yaml-formatting @@ -115,9 +115,9 @@ fix-go-formatting: SAVE ARTIFACT "./src" AS LOCAL "./src" -fix-sh-formatting: +fix-shell-formatting: FROM +sh-formatting-base - RUN ./ci/fix-sh-formatting.sh + RUN ./ci/fix-shell-formatting.sh SAVE ARTIFACT "./ci" AS LOCAL "./ci" @@ -129,7 +129,7 @@ fix-yaml-formatting: fix-formatting: BUILD +fix-go-formatting - BUILD +fix-sh-formatting + BUILD +fix-shell-formatting BUILD +fix-yaml-formatting @@ -147,11 +147,11 @@ ubuntu-base: RUN apt-get update --fix-missing -check-sh-linting: +check-shell-linting: FROM +ubuntu-base RUN apt-get install shellcheck -y DO +COPY_CI_DATA - RUN ./ci/check-sh-linting.sh + RUN ./ci/check-shell-linting.sh check-github-actions-workflows-linting: @@ -163,7 +163,7 @@ check-github-actions-workflows-linting: check-linting: BUILD +check-go-linting - BUILD +check-sh-linting + BUILD +check-shell-linting BUILD +check-github-actions-workflows-linting diff --git a/ci/check-sh-formatting.sh b/ci/check-shell-formatting.sh similarity index 100% rename from ci/check-sh-formatting.sh rename to ci/check-shell-formatting.sh diff --git a/ci/check-sh-linting.sh b/ci/check-shell-linting.sh similarity index 100% rename from ci/check-sh-linting.sh rename to ci/check-shell-linting.sh diff --git a/ci/fix-sh-formatting.sh b/ci/fix-shell-formatting.sh similarity index 100% rename from ci/fix-sh-formatting.sh rename to ci/fix-shell-formatting.sh