From 18310849703e586ad68db42fd018d3ba11558bc9 Mon Sep 17 00:00:00 2001 From: Mythie Date: Fri, 8 Dec 2023 09:29:47 +1100 Subject: [PATCH 1/2] chore: update ci --- .github/workflows/deploy.yml | 26 ++++++++++++++++++++++++++ .github/workflows/e2e-tests.yml | 1 + 2 files changed, 27 insertions(+) create mode 100644 .github/workflows/deploy.yml diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml new file mode 100644 index 000000000..118cb673f --- /dev/null +++ b/.github/workflows/deploy.yml @@ -0,0 +1,26 @@ +name: Deploy to Production + +on: + push: + tags: + - '*' + +jobs: + deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + with: + ref: main + fetch-depth: 0 + + - name: Push to release branch + run: | + git config user.name "GitHub Actions" + git config user.email "actions@github.com" + + git checkout release || git checkout -b release + git merge --ff-only main + git push origin release diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml index 50c25f923..506abbc5f 100644 --- a/.github/workflows/e2e-tests.yml +++ b/.github/workflows/e2e-tests.yml @@ -6,6 +6,7 @@ on: branches: [ "main" ] jobs: e2e_tests: + name: "E2E Tests" timeout-minutes: 60 runs-on: ubuntu-latest steps: From 4e799e68ef1eaa46e71b241366eba7d9a15e167a Mon Sep 17 00:00:00 2001 From: Mythie Date: Fri, 8 Dec 2023 09:44:36 +1100 Subject: [PATCH 2/2] chore: update ci --- .github/workflows/deploy.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 118cb673f..80d188964 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -15,12 +15,10 @@ jobs: with: ref: main fetch-depth: 0 + token: ${{ secrets.GH_TOKEN }} - name: Push to release branch run: | - git config user.name "GitHub Actions" - git config user.email "actions@github.com" - git checkout release || git checkout -b release git merge --ff-only main git push origin release