From f51549ec24a2ee535ea9db92c0e75d5d5014442b Mon Sep 17 00:00:00 2001 From: Sam Dudley Date: Tue, 26 Mar 2024 11:39:08 +0000 Subject: [PATCH] wip --- .circleci/config.yml | 50 ---------------------------------------- .env.ci | 8 +++---- .github/workflows/ci.yml | 2 -- 3 files changed, 4 insertions(+), 56 deletions(-) delete mode 100644 .circleci/config.yml diff --git a/.circleci/config.yml b/.circleci/config.yml deleted file mode 100644 index 87a93fef..00000000 --- a/.circleci/config.yml +++ /dev/null @@ -1,50 +0,0 @@ -version: 2.1 - -orbs: - browser-tools: circleci/browser-tools@1.4.8 -jobs: - build: - machine: - image: ubuntu-2204:2023.04.2 - docker_layer_caching: true - - steps: - - checkout - - run: mkdir test-reports - - run: cp .env.ci .env - - run: - name: Build images - command: make build - - run: - name: Run containers - command: make up-detatched - - run: - name: Install npm packages - command: npm ci - - run: - name: Run postinstall script - command: npm run postinstall - - run: - name: Collect static - command: make collectstatic - - run: - name: Run Flake8 - command: make flake8 - - run: - name: Run isort - command: make isort-check - - run: - name: Run black - command: make black-check - - run: - name: Run tests - command: make pytest - - run: - name: Run BDD tests - command: make bdd - - - store_artifacts: - path: test-reports/ - destination: tr1 - - store_test_results: - path: test-reports/ diff --git a/.env.ci b/.env.ci index 819399bd..761b6159 100644 --- a/.env.ci +++ b/.env.ci @@ -3,7 +3,7 @@ DATABASE_URL=psql://postgres:postgres@db:5432/fido FLASK_CONFIG=testing SECRET_KEY=used_for_testing ALLOWED_HOSTS="*" -AUTHBROKER_CLIENT_ID="" -AUTHBROKER_CLIENT_SECRET="" -AUTHBROKER_URL="" -DEBUG=false \ No newline at end of file +AUTHBROKER_CLIENT_ID= +AUTHBROKER_CLIENT_SECRET= +AUTHBROKER_URL= +DEBUG=False diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7bcf7c2b..d9cef327 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -19,8 +19,6 @@ jobs: with: node-version: 18 - - uses: browser-actions/setup-chrome@v1 - - name: Create a .env file run: cp .env.ci .env