From aa4c87f71039e638fc4f4fa610f01f67eaa25952 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Jan 2022 16:35:18 +0100 Subject: [PATCH 1/7] Test with github action update --- .../workflows/github_action_test_suite.yml | 34 ++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index 9bd8674744..c0b31dd40e 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -44,7 +44,7 @@ jobs: mysql user: 'evennia' mysql password: 'password' - # wait for db to activage, get logs from their start + # wait for db to activate, get logs from their start - name: Wait / sleep uses: jakejarvis/wait-action@v0.1.0 if: ${{ matrix.TESTING_DB == 'postgresql' || matrix.TESTING_DB == 'mysql' }} @@ -107,3 +107,35 @@ jobs: with: project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} coverage-reports: ./testing_mygame/coverage.xml + + docker: + runs-on: ubuntu-latest + steps: + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push for master + if: ${{ matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 && github.ref == 'refs/heads/master'}} + id: docker_build_master + uses: docker/build-push-action@v2 + with: + push: true + tags: user/app:latest + - + name: Build and push for develop + if: ${{ matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 && github.ref == 'refs/heads/develop'}} + id: docker_build_develop + uses: docker/build-push-action@v2 + with: + push: true + tags: user/app:develop From 7f29029a415c660304a427695a0f8fa3a5a4293d Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Jan 2022 16:37:25 +0100 Subject: [PATCH 2/7] Some more testing with actions --- .github/workflows/github_action_test_suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index c0b31dd40e..e57a8366fd 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -130,7 +130,7 @@ jobs: uses: docker/build-push-action@v2 with: push: true - tags: user/app:latest + tags: evennia/evennia:latest - name: Build and push for develop if: ${{ matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 && github.ref == 'refs/heads/develop'}} @@ -138,4 +138,4 @@ jobs: uses: docker/build-push-action@v2 with: push: true - tags: user/app:develop + tags: evennia/evennia:develop From 79b79e2fb3e06da642e1c1ef2bef5780b060e91f Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Jan 2022 16:47:15 +0100 Subject: [PATCH 3/7] Another test in actions --- .github/workflows/github_action_test_suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index e57a8366fd..aeacc68757 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -125,7 +125,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push for master - if: ${{ matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 && github.ref == 'refs/heads/master'}} + if: github.ref == 'refs/heads/master'}} id: docker_build_master uses: docker/build-push-action@v2 with: @@ -133,7 +133,7 @@ jobs: tags: evennia/evennia:latest - name: Build and push for develop - if: ${{ matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 && github.ref == 'refs/heads/develop'}} + if: matrix.python-version == 3.7 && github.ref == 'refs/heads/develop'}} id: docker_build_develop uses: docker/build-push-action@v2 with: From db8ce5cd0e8ab7c1bec34d3129c68d8cdf5ad13b Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Jan 2022 16:50:15 +0100 Subject: [PATCH 4/7] And another rebuild --- .github/workflows/github_action_test_suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index aeacc68757..489212cf48 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -125,7 +125,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push for master - if: github.ref == 'refs/heads/master'}} + if: github.ref == 'refs/heads/master' id: docker_build_master uses: docker/build-push-action@v2 with: @@ -133,7 +133,7 @@ jobs: tags: evennia/evennia:latest - name: Build and push for develop - if: matrix.python-version == 3.7 && github.ref == 'refs/heads/develop'}} + if: github.ref == 'refs/heads/develop' id: docker_build_develop uses: docker/build-push-action@v2 with: From df4e5e0d7c658c49d4f1fd4a4216191a202413c1 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Jan 2022 16:56:15 +0100 Subject: [PATCH 5/7] Group push under main build action --- .../workflows/github_action_test_suite.yml | 60 +++++++++---------- 1 file changed, 29 insertions(+), 31 deletions(-) diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index 489212cf48..4ed6114ba9 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -108,34 +108,32 @@ jobs: project-token: ${{ secrets.CODACY_PROJECT_TOKEN }} coverage-reports: ./testing_mygame/coverage.xml - docker: - runs-on: ubuntu-latest - steps: - - - name: Set up QEMU - uses: docker/setup-qemu-action@v1 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v1 - - - name: Login to DockerHub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: Build and push for master - if: github.ref == 'refs/heads/master' - id: docker_build_master - uses: docker/build-push-action@v2 - with: - push: true - tags: evennia/evennia:latest - - - name: Build and push for develop - if: github.ref == 'refs/heads/develop' - id: docker_build_develop - uses: docker/build-push-action@v2 - with: - push: true - tags: evennia/evennia:develop + # docker setup and push + - + name: Set up QEMU + uses: docker/setup-qemu-action@v1 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push for master + if: github.ref == 'refs/heads/master' + id: docker_build_master + uses: docker/build-push-action@v2 + with: + push: true + tags: evennia/evennia:latest + - + name: Build and push for develop + if: github.ref == 'refs/heads/develop' + id: docker_build_develop + uses: docker/build-push-action@v2 + with: + push: true + tags: evennia/evennia:develop From 84f03d73e5c7b55822d6489ada35e85f28f1a56a Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Jan 2022 17:13:39 +0100 Subject: [PATCH 6/7] Add limiters to not do multiple pushes in a test build --- .github/workflows/github_action_test_suite.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index 4ed6114ba9..b2ee446eb8 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -123,7 +123,7 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push for master - if: github.ref == 'refs/heads/master' + if: matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 && github.ref == 'refs/heads/master' id: docker_build_master uses: docker/build-push-action@v2 with: @@ -131,7 +131,7 @@ jobs: tags: evennia/evennia:latest - name: Build and push for develop - if: github.ref == 'refs/heads/develop' + if: matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 && github.ref == 'refs/heads/develop' id: docker_build_develop uses: docker/build-push-action@v2 with: From a920a0d084a0dad58c92a524565be365d4f769c7 Mon Sep 17 00:00:00 2001 From: Griatch Date: Sun, 16 Jan 2022 17:26:59 +0100 Subject: [PATCH 7/7] Further limit push --- .github/workflows/github_action_test_suite.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/github_action_test_suite.yml b/.github/workflows/github_action_test_suite.yml index b2ee446eb8..e0d0d3979a 100644 --- a/.github/workflows/github_action_test_suite.yml +++ b/.github/workflows/github_action_test_suite.yml @@ -18,7 +18,7 @@ jobs: strategy: fail-fast: false matrix: - python-version: [3.7, 3.8] + python-version: [3.7, 3.8, 3.9] TESTING_DB: ['sqlite3', 'postgresql', 'mysql'] steps: @@ -111,12 +111,15 @@ jobs: # docker setup and push - name: Set up QEMU + if: matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 uses: docker/setup-qemu-action@v1 - name: Set up Docker Buildx + if: matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 uses: docker/setup-buildx-action@v1 - name: Login to DockerHub + if: matrix.TESTING_DB == 'sqlite3' && matrix.python-version == 3.7 uses: docker/login-action@v1 with: username: ${{ secrets.DOCKERHUB_USERNAME }}