From 7dab4abbd3073b32f544bb34c55e0d80ed6c19ca Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 14 May 2024 02:40:01 +0200 Subject: [PATCH 1/8] ci: test if oidc works --- .forgejo/workflows/ci.yaml | 43 +++++++++++++++++++------------------- 1 file changed, 21 insertions(+), 22 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 8989c51..8db9d2f 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -1,10 +1,6 @@ name: Visitenbuch CI on: push: - branches: - - "main" - tags: - - "v*" pull_request: jobs: @@ -32,25 +28,28 @@ jobs: steps: - name: ๐Ÿ‘๏ธ Checkout repository uses: actions/checkout@v4 - - name: ๐Ÿ“ฆ pnpm install + - name: Test run: | - pnpm install - cp .env.test .env - - name: ๐Ÿง lint - run: | - npm run check - npm run lint - - name: ๐Ÿงช Unit test - run: npm run test:unit - - name: ๐Ÿงช Integration test - run: | - npx prisma migrate reset --force - npm run test:integration - - name: ๐Ÿ‘จโ€๐Ÿ”ฌ E2E test - run: | - npx playwright install --with-deps - npm run build - npm run test:e2e + curl http://oidc:3000/.well-known/openid-configuration + # - name: ๐Ÿ“ฆ pnpm install + # run: | + # pnpm install + # cp .env.test .env + # - name: ๐Ÿง lint + # run: | + # npm run check + # npm run lint + # - name: ๐Ÿงช Unit test + # run: npm run test:unit + # - name: ๐Ÿงช Integration test + # run: | + # npx prisma migrate reset --force + # npm run test:integration + # - name: ๐Ÿ‘จโ€๐Ÿ”ฌ E2E test + # run: | + # npx playwright install --with-deps + # npm run build + # npm run test:e2e release: runs-on: cimaster-latest From 04523b17e98551375d81d56b1c93090a32c01fe8 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 14 May 2024 02:42:43 +0200 Subject: [PATCH 2/8] ci test --- .forgejo/workflows/ci.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 8db9d2f..938735f 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -30,7 +30,9 @@ jobs: uses: actions/checkout@v4 - name: Test run: | + sleep 5 curl http://oidc:3000/.well-known/openid-configuration + sleep 360 # - name: ๐Ÿ“ฆ pnpm install # run: | # pnpm install From a17ca9bbba3b02d652e5f7b1534a86fad2b75e66 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 14 May 2024 03:20:18 +0200 Subject: [PATCH 3/8] ci: test --- .forgejo/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 938735f..f1e4f84 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -32,7 +32,7 @@ jobs: run: | sleep 5 curl http://oidc:3000/.well-known/openid-configuration - sleep 360 + sleep 1000 # - name: ๐Ÿ“ฆ pnpm install # run: | # pnpm install From e63888a1037130583e70b000de5f2677c34855b3 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 14 May 2024 03:21:24 +0200 Subject: [PATCH 4/8] ci: test --- .forgejo/workflows/ci.yaml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index f1e4f84..019e0af 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -30,8 +30,6 @@ jobs: uses: actions/checkout@v4 - name: Test run: | - sleep 5 - curl http://oidc:3000/.well-known/openid-configuration sleep 1000 # - name: ๐Ÿ“ฆ pnpm install # run: | From b0b2cb5bb953968d9eeeafb8389d459c1e6d8b40 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 14 May 2024 03:35:20 +0200 Subject: [PATCH 5/8] ci: run container itself --- .forgejo/workflows/ci.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 019e0af..22df193 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -4,6 +4,21 @@ on: pull_request: jobs: + oidcmock: + runs-on: cimaster-latest + container: thetadev256/oidc-mock-server + env: + CLIENT_ID: visitenbuch + CLIENT_SECRET: supersecret + CLIENT_REDIRECT_URIS: http://localhost:4173/auth/callback/keycloak + CLIENT_LOGOUT_REDIRECT_URIS: http://localhost:4173/login?noAuto=1 + ISSUER_HOST: oidc:3000 + steps: + - name: Test + run: | + cd /app + node server.js + test: runs-on: cimaster-latest services: From e7de2f2588a16ee5c76623530a56e262964a7fe7 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 14 May 2024 03:46:57 +0200 Subject: [PATCH 6/8] ci: only oidc-mock-server --- .forgejo/workflows/ci.yaml | 26 ++++++-------------------- 1 file changed, 6 insertions(+), 20 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 22df193..2959826 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -4,29 +4,14 @@ on: pull_request: jobs: - oidcmock: - runs-on: cimaster-latest - container: thetadev256/oidc-mock-server - env: - CLIENT_ID: visitenbuch - CLIENT_SECRET: supersecret - CLIENT_REDIRECT_URIS: http://localhost:4173/auth/callback/keycloak - CLIENT_LOGOUT_REDIRECT_URIS: http://localhost:4173/login?noAuto=1 - ISSUER_HOST: oidc:3000 - steps: - - name: Test - run: | - cd /app - node server.js - test: runs-on: cimaster-latest services: - postgres: - image: postgres - env: - POSTGRES_DB: "test" - POSTGRES_PASSWORD: "1234" + # postgres: + # image: postgres + # env: + # POSTGRES_DB: "test" + # POSTGRES_PASSWORD: "1234" oidc: image: thetadev256/oidc-mock-server env: @@ -35,6 +20,7 @@ jobs: CLIENT_REDIRECT_URIS: http://localhost:4173/auth/callback/keycloak CLIENT_LOGOUT_REDIRECT_URIS: http://localhost:4173/login?noAuto=1 ISSUER_HOST: oidc:3000 + env: DATABASE_URL: "postgresql://postgres:1234@postgres:5432/test?schema=public" TEST_DATABASE_URL: "postgresql://postgres:1234@postgres:5432/test?schema=public" From 7ea87d42402c1b155a4cc27abe6365e2aad7ee86 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 14 May 2024 03:48:36 +0200 Subject: [PATCH 7/8] ci: use test oidc image --- .forgejo/workflows/ci.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index 2959826..be3233e 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -13,7 +13,7 @@ jobs: # POSTGRES_DB: "test" # POSTGRES_PASSWORD: "1234" oidc: - image: thetadev256/oidc-mock-server + image: thetadev256/oidc-mock-server:test env: CLIENT_ID: visitenbuch CLIENT_SECRET: supersecret From 1de0cf7d5905cc259557d06b4446bdbd20fd4e43 Mon Sep 17 00:00:00 2001 From: ThetaDev Date: Tue, 14 May 2024 03:56:04 +0200 Subject: [PATCH 8/8] ci: fixed oidc-mock image --- .forgejo/workflows/ci.yaml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.forgejo/workflows/ci.yaml b/.forgejo/workflows/ci.yaml index be3233e..a7d881e 100644 --- a/.forgejo/workflows/ci.yaml +++ b/.forgejo/workflows/ci.yaml @@ -7,13 +7,13 @@ jobs: test: runs-on: cimaster-latest services: - # postgres: - # image: postgres - # env: - # POSTGRES_DB: "test" - # POSTGRES_PASSWORD: "1234" + postgres: + image: postgres + env: + POSTGRES_DB: "test" + POSTGRES_PASSWORD: "1234" oidc: - image: thetadev256/oidc-mock-server:test + image: thetadev256/oidc-mock-server env: CLIENT_ID: visitenbuch CLIENT_SECRET: supersecret @@ -31,7 +31,7 @@ jobs: uses: actions/checkout@v4 - name: Test run: | - sleep 1000 + curl http://oidc:3000/.well-known/openid-configuration || sleep 1000 # - name: ๐Ÿ“ฆ pnpm install # run: | # pnpm install