From de6c57c6bc0acfee0b4ced53a291ec02ee3f2a95 Mon Sep 17 00:00:00 2001 From: Jason Garber Date: Wed, 28 Feb 2024 11:07:07 -0500 Subject: [PATCH] Streamline workflows --- .github/workflows/lint.yml | 10 +++++++++- .github/workflows/release.yml | 3 --- .github/workflows/validate.yml | 18 ------------------ 3 files changed, 9 insertions(+), 22 deletions(-) delete mode 100644 .github/workflows/validate.yml diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index b749ad4..88a3ccb 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -8,7 +8,7 @@ on: workflow_dispatch: jobs: - shellchecker: + lint-shell-scripts: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 @@ -19,3 +19,11 @@ jobs: env: # Acceptable use of decimal comparison SHELLCHECK_OPTS: -e SC2072 + validate-feature-json: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v4 + - uses: devcontainers/action@v1 + with: + base-path-to-features: "./src" + validate-only: "true" diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index c2be8c5..a874d08 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -9,8 +9,6 @@ jobs: uses: "./.github/workflows/lint.yml" test: uses: "./.github/workflows/test.yml" - validate: - uses: "./.github/workflows/validate.yml" publish-to-github-packages: runs-on: ubuntu-latest permissions: @@ -19,7 +17,6 @@ jobs: needs: - lint - test - - validate steps: - uses: actions/checkout@v4 - uses: devcontainers/action@v1 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml deleted file mode 100644 index 1d85f1b..0000000 --- a/.github/workflows/validate.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Validate devcontainer-feature.json files - -on: - pull_request: - push: - branches: [main] - workflow_call: - workflow_dispatch: - -jobs: - validate: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - - uses: devcontainers/action@v1 - with: - base-path-to-features: "./src" - validate-only: "true"