diff --git a/.github/workflows/php-8.1-couch-mongo-validate.yml b/.github/workflows/php-8.1-couch-mongo-validate.yml deleted file mode 100644 index 1d3e5ac..0000000 --- a/.github/workflows/php-8.1-couch-mongo-validate.yml +++ /dev/null @@ -1,11 +0,0 @@ -on: push -name: php-8.1-couch-mongo-validate -jobs: - validate: - runs-on: ubuntu-latest - container: - image: kirschbaumdevelopment/laravel-test-runner:8.1-couch-mongo - - steps: - - uses: actions/checkout@v1 - - run: goss --gossfile 8.1-couch-mongo/goss.yaml validate diff --git a/.github/workflows/php-8.1-couch-mongo.yml b/.github/workflows/php-8.1-couch-mongo.yml index 02bc312..a35fb60 100644 --- a/.github/workflows/php-8.1-couch-mongo.yml +++ b/.github/workflows/php-8.1-couch-mongo.yml @@ -18,3 +18,15 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} workdir: 8.1-couch-mongo tags: "8.1-couch-mongo" + + validate: + runs-on: ubuntu-latest + needs: publish + container: + image: kirschbaumdevelopment/laravel-test-runner:8.1-couch-mongo + + steps: + - uses: actions/checkout@v2 + - run: | + curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh + goss --gossfile 8.1-couch-mongo/goss.yaml validate \ No newline at end of file diff --git a/.github/workflows/php-8.1-publish.yml b/.github/workflows/php-8.1-publish.yml index d964819..41906a0 100644 --- a/.github/workflows/php-8.1-publish.yml +++ b/.github/workflows/php-8.1-publish.yml @@ -24,5 +24,7 @@ jobs: image: kirschbaumdevelopment/laravel-test-runner:8.1 steps: - - uses: actions/checkout@v1 - - run: goss --gossfile 8.1/goss.yaml validate \ No newline at end of file + - uses: actions/checkout@v2 + - run: | + curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh + goss --gossfile 8.1/goss.yaml validate \ No newline at end of file diff --git a/.github/workflows/php-8.2-publish.yml b/.github/workflows/php-8.2-publish.yml index ac70a96..383d1c5 100644 --- a/.github/workflows/php-8.2-publish.yml +++ b/.github/workflows/php-8.2-publish.yml @@ -24,5 +24,7 @@ jobs: image: kirschbaumdevelopment/laravel-test-runner:8.2 steps: - - uses: actions/checkout@v1 - - run: goss --gossfile 8.2/goss.yaml validate \ No newline at end of file + - uses: actions/checkout@v2 + - run: | + curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh + goss --gossfile 8.2/goss.yaml validate \ No newline at end of file diff --git a/.github/workflows/php-8.3-publish.yml b/.github/workflows/php-8.3-publish.yml index 0117dad..69c1976 100644 --- a/.github/workflows/php-8.3-publish.yml +++ b/.github/workflows/php-8.3-publish.yml @@ -25,4 +25,6 @@ jobs: steps: - uses: actions/checkout@v2 - - run: goss --gossfile 8.3/goss.yaml validate \ No newline at end of file + - run: | + curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh + goss --gossfile 8.3/goss.yaml validate \ No newline at end of file diff --git a/8.1/Dockerfile b/8.1/Dockerfile index 58a5f9f..2109c97 100644 --- a/8.1/Dockerfile +++ b/8.1/Dockerfile @@ -46,6 +46,3 @@ RUN apt-get install -y git RUN curl -sL https://deb.nodesource.com/setup_14.x | bash - RUN apt-get install -y nodejs RUN npm install -g yarn - -# goss -RUN curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh diff --git a/8.2/Dockerfile b/8.2/Dockerfile index a578980..b3e01a9 100644 --- a/8.2/Dockerfile +++ b/8.2/Dockerfile @@ -46,6 +46,3 @@ RUN apt-get install -y git RUN curl -sL https://deb.nodesource.com/setup_16.x | bash - RUN apt-get install -y nodejs RUN npm install -g yarn - -# goss -RUN curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh diff --git a/8.3/Dockerfile b/8.3/Dockerfile index 95847e4..2cbeb6c 100644 --- a/8.3/Dockerfile +++ b/8.3/Dockerfile @@ -53,6 +53,3 @@ RUN apt-get update && apt-get install nodejs -y # yarn RUN npm install -g yarn - -# goss -RUN curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh