Skip to content

Commit

Permalink
Revert "ci: temporary try to run all tests even when some other fail"
Browse files Browse the repository at this point in the history
This reverts commit a182f61.
  • Loading branch information
weyert committed Aug 10, 2024
1 parent a182f61 commit a1379cb
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 28 deletions.
23 changes: 11 additions & 12 deletions .github/workflows/test-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ jobs:
test:
name: "Runner (${{ inputs.runner }}) / Node (${{ inputs.node-version }}) / Runtime (${{ inputs.container-runtime }}) / Workspace (${{ inputs.workspace }})"
runs-on: ${{ inputs.runner }}
continue-on-error: true
steps:
- name: Docker rootless setup 1/2
if: ${{ inputs.container-runtime == 'docker-rootless' }}
Expand Down Expand Up @@ -71,13 +70,13 @@ jobs:
run: |
brew install docker docker-compose
brew install --cask rancher
TIMEOUT_SECS_CLI_TOOLS=60
TIMEOUT_SECS_USER_SOCKET=300
echo "Open Rancher Desktop app"
open "/Applications/Rancher Desktop.app"
echo "Wait max of ${TIMEOUT_SECS_CLI_TOOLS}s for Rancher Desktop to create CLI tools"
for i in $(seq 1 ${TIMEOUT_SECS_CLI_TOOLS}); do
if [ -e "$HOME/.rd/bin/rdctl" ]; then
Expand All @@ -86,12 +85,12 @@ jobs:
fi
sleep 1
done
if [ ! -e "$HOME/.rd/bin/rdctl" ]; then
echo "Rancher Desktop CLI tools not found"
exit 1
fi
echo "Rancher Desktop initialised successfully, now configure the container runtime"
$HOME/.rd/bin/rdctl set \
--container-engine.name=moby \
Expand All @@ -102,28 +101,28 @@ jobs:
--virtual-machine.number-cpus=3 \
--virtual-machine.memory-in-gb=14 \
|| true
echo "Restart Rancher Desktop"
$HOME/.rd/bin/rdctl shutdown
$HOME/.rd/bin/rdctl start
echo "Wait max of ${TIMEOUT_SECS_USER_SOCKET}s for Rancher socket"
for i in $(seq 1 ${TIMEOUT_SECS_USER_SOCKET}); do
if [ -e "$HOME/.rd/docker.sock" ]; then
echo "Rancher Desktop socket created after ${i}s"
break
fi
sleep 1
done
if [ ! -e "$HOME/.rd/docker.sock" ]; then
echo "Rancher Desktop socket not found"
exit 1
fi
echo "{}" > $HOME/.docker/config.json
echo "DOCKER_HOST=unix://${HOME}/.rd/docker.sock" >> $GITHUB_ENV
echo "TESTCONTAINERS_DOCKER_SOCKET_OVERRIDE=/var/run/docker.sock" >> $GITHUB_ENV
echo "NODE_OPTIONS=--dns-result-order=ipv4first" >> $GITHUB_ENV
Expand Down
33 changes: 17 additions & 16 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ name: Test

on:
push:
branches: [main]
branches: [ main ]
paths-ignore:
- "mkdocs.yml"
- "docs/**"
- "README.md"
- 'mkdocs.yml'
- 'docs/**'
- 'README.md'
pull_request:
branches: [main]
branches: [ main ]
paths-ignore:
- "mkdocs.yml"
- "docs/**"
- "README.md"
- 'mkdocs.yml'
- 'docs/**'
- 'README.md'

concurrency:
group: "${{ github.workflow }}-${{ github.head_ref || github.sha }}"
Expand All @@ -24,8 +24,8 @@ jobs:
runs-on: ${{ matrix.runner }}
strategy:
matrix:
runner: [ubuntu-22.04]
node-version: [20.x]
runner: [ ubuntu-22.04 ]
node-version: [ 18.x, 20.x ]
steps:
- name: Code checkout
uses: actions/checkout@v3
Expand All @@ -49,11 +49,13 @@ jobs:
needs: smoke-test
strategy:
matrix:
node-version: [20.x]
container-runtime: [docker]
node-version: [ 18.x, 20.x ]
container-runtime: [ docker, podman ]
include:
- container-runtime: docker
runner: ubuntu-22.04
- container-runtime: podman
runner: ubuntu-22.04
uses: ./.github/workflows/test-template.yml
with:
runner: ${{ matrix.runner }}
Expand All @@ -73,12 +75,11 @@ jobs:
run: echo "modules=$(ls packages/modules | jq -cnR '[inputs | select(length>0) | select(. != "couchbase")]')" >> $GITHUB_OUTPUT
test-modules:
name: Module (${{ matrix.module }})
needs: [test-testcontainers, list-modules]
needs: [ test-testcontainers, list-modules ]
strategy:
fail-fast: false
matrix:
node-version: [18.x, 20.x]
container-runtime: [docker, podman]
node-version: [ 18.x, 20.x ]
container-runtime: [ docker, podman ]
include:
- container-runtime: docker
runner: ubuntu-22.04
Expand Down

0 comments on commit a1379cb

Please sign in to comment.