From 56151688dbb8658e0365109a216b81d6d02d1779 Mon Sep 17 00:00:00 2001 From: Han Date: Fri, 14 Jun 2024 19:36:37 +0100 Subject: [PATCH] remove commented out code and debugging setting --- .github/workflows/publish-outpost-image.yml | 2 +- .github/workflows/test-docker-build.yml | 6 ------ .github/workflows/test-in-herokuish.yml | 22 --------------------- 3 files changed, 1 insertion(+), 29 deletions(-) diff --git a/.github/workflows/publish-outpost-image.yml b/.github/workflows/publish-outpost-image.yml index 00b13084..d5ecc134 100644 --- a/.github/workflows/publish-outpost-image.yml +++ b/.github/workflows/publish-outpost-image.yml @@ -4,7 +4,7 @@ name: Publish outpost image to github container registry on: push: - branches: [develop, staging, production, feature/disable-multi-platform] + branches: [develop, staging, production] # multi platform builds are disabled until we upgrade to a newer version of heroku stack jobs: diff --git a/.github/workflows/test-docker-build.yml b/.github/workflows/test-docker-build.yml index dcb259be..b31c484a 100644 --- a/.github/workflows/test-docker-build.yml +++ b/.github/workflows/test-docker-build.yml @@ -28,12 +28,6 @@ jobs: echo "tag=default" >> $GITHUB_ENV fi - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 - - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v3 - - name: Build Docker image uses: docker/build-push-action@v5 with: diff --git a/.github/workflows/test-in-herokuish.yml b/.github/workflows/test-in-herokuish.yml index 3f81b0a4..68d4f08a 100644 --- a/.github/workflows/test-in-herokuish.yml +++ b/.github/workflows/test-in-herokuish.yml @@ -1,5 +1,3 @@ -# @TODO fix static files not generating in this image - # RAILS_ENV: test # NODE_ENV: development # test_mongo_local_db_uri="mongodb://$(test_mongo_db_user):$(test_mongo_db_password)@localhost:$(test_mongo_port)/$(test_mongo_db_name)" @@ -66,26 +64,10 @@ jobs: -e POSTGRES_USER=$test_postgres_db_user \ postgres:13.7-alpine - # options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5 - - # - name: "Login to GitHub Container Registry" - # uses: docker/login-action@v3 - # with: - # registry: ghcr.io - # username: ${{github.actor}} - # password: ${{secrets.GITHUB_TOKEN}} - - # - name: Set up QEMU - # uses: docker/setup-qemu-action@v3 - - # - name: Set up Docker Buildx - # uses: docker/setup-buildx-action@v3 - - name: Build Docker image uses: docker/build-push-action@v5 with: context: . - # tags: ghcr.io/wearefuturegov/outpost:test tags: outpost:test file: Dockerfile.test load: true @@ -101,10 +83,6 @@ jobs: NODE_ENV=test NODE_MODULES_CACHE=true - # - name: Test - # run: | - # docker run --rm outpost:test - - name: Run the image and tests run: | docker run --rm --name test_container \