From f6892df7cf539b7f14db2450449a5249247f49f7 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 9bd867474..c0b31dd40 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 2db89802c77d3643899fd323e4f91f828370dd31 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 c0b31dd40..e57a8366f 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 fcc3e3ebdbf6c6c286be8c1866646992c41ef1e9 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 e57a8366f..aeacc6875 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 dc8f557d76bf6cd3098d493ce5683546a26640c4 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 aeacc6875..489212cf4 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 bd80bfe406f5a4decae4ef3a2a2c6d51534da04e 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 489212cf4..4ed6114ba 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 a58017f72fc241f1e1dad3a1394f0998d7030f37 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 4ed6114ba..b2ee446eb 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 437597228101867d23df5888d550a475970373a3 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 b2ee446eb..e0d0d3979 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 }}