Skip to content

Commit

Permalink
fix: do not use cached version
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed Mar 24, 2022
1 parent 2b024b4 commit 422d422
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 20 deletions.
18 changes: 0 additions & 18 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -140,27 +140,10 @@ jobs:
pkcs11-tool --module /usr/lib/softhsm/libsofthsm2.so --slot 0 --init-token --so-pin 0000 --init-pin --pin 1234 --label hydra
go test -p 1 -v -failfast -short -timeout=20m -tags=sqlite,hsm ./...
setup-e2e:
name: Setup end-to-end tests
needs:
- sdk-generate
runs-on: ubuntu-latest
steps:
- uses: ory/ci/checkout@master
- uses: actions/setup-go@v2
with:
go-version: ^1.16
- run: go build -tags sqlite -o test/e2e/hydra .
- uses: actions/cache@v2
with:
path: ./test/e2e/hydra
key: ${{ runner.os }}-hydra

test-e2e:
name: Run end-to-end tests
runs-on: ubuntu-latest
needs:
- setup-e2e
- sdk-generate
strategy:
matrix:
Expand All @@ -185,7 +168,6 @@ jobs:
TEST_DATABASE_POSTGRESQL: "postgres://test:test@localhost:5432/postgres?sslmode=disable"
TEST_DATABASE_MYSQL: "mysql://root:test@(localhost:3306)/mysql?multiStatements=true&parseTime=true"
TEST_DATABASE_COCKROACHDB: "cockroach://root@localhost:26257/defaultdb?sslmode=disable"
SKIP_HYDRA_BUILD: 1
steps:
- run: |
docker create --name cockroach -p 26257:26257 \
Expand Down
3 changes: 1 addition & 2 deletions test/e2e/circle-ci.bash
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ if [[ ! -d "../../node_modules/" ]]; then
(cd ../..; npm ci)
fi

[[ "${SKIP_HYDRA_BUILD:-0}" -ne 1 ]] &&
(cd ../../; go build -tags sqlite -o test/e2e/hydra . )
(cd ../../; go build -tags sqlite -o test/e2e/hydra . )

# Install oauth2-client
if [[ ! -d "./oauth2-client/node_modules/" ]]; then
Expand Down

0 comments on commit 422d422

Please sign in to comment.