From 0c3b327f57bb9c1e47e5fbf868faa73e977792fe Mon Sep 17 00:00:00 2001 From: Faizaan Gagan Date: Tue, 15 Feb 2022 12:07:10 +0530 Subject: [PATCH 1/4] FIX: checkout correct branches of plugin and discourse --- .github/workflows/plugin-tests.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml index 855bdfec49..cc54954350 100644 --- a/.github/workflows/plugin-tests.yml +++ b/.github/workflows/plugin-tests.yml @@ -52,7 +52,7 @@ jobs: - uses: actions/checkout@v2 with: repository: discourse/discourse - ref: "${{ (github.base_ref || github.ref) }}" + ref: "${{ github.base_ref === 'stable' ? 'stable' : 'tests-passed' }}" fetch-depth: 1 - name: Fetch Repo Name @@ -63,6 +63,7 @@ jobs: uses: actions/checkout@v2 with: path: plugins/${{ steps.repo-name.outputs.value }} + ref: "${{ github.base_ref }}" fetch-depth: 1 - name: Check spec existence From 99627649246c5cea26650276a841f9e70d1d780a Mon Sep 17 00:00:00 2001 From: Faizaan Gagan Date: Wed, 16 Feb 2022 00:42:18 +0530 Subject: [PATCH 2/4] add condition to check correct discourse branch --- .github/workflows/plugin-tests.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml index cc54954350..e71daea4e2 100644 --- a/.github/workflows/plugin-tests.yml +++ b/.github/workflows/plugin-tests.yml @@ -49,10 +49,17 @@ jobs: --health-retries 5 steps: + - uses: haya14busa/action-cond@v1 + id: discourse_branch + with: + cond: ${{ github.base_ref == 'stable' }} + if_true: "stable" + if_false: "tests-passed" + - uses: actions/checkout@v2 with: repository: discourse/discourse - ref: "${{ github.base_ref === 'stable' ? 'stable' : 'tests-passed' }}" + ref: ${{ steps.discourse_branch.outputs.value }} fetch-depth: 1 - name: Fetch Repo Name From 95b77c6bfd01b938494519292276c55670f55d10 Mon Sep 17 00:00:00 2001 From: Faizaan Gagan Date: Wed, 16 Feb 2022 00:52:37 +0530 Subject: [PATCH 3/4] FIX: use updated redis version --- .github/workflows/plugin-tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml index e71daea4e2..aec4fa6c9b 100644 --- a/.github/workflows/plugin-tests.yml +++ b/.github/workflows/plugin-tests.yml @@ -31,7 +31,7 @@ jobs: build_type: ["backend", "frontend"] ruby: ["2.7"] postgres: ["12"] - redis: ["4.x"] + redis: ["6.x"] services: postgres: From 49fbc3604f874c329a79727dd3df9538f2ab4680 Mon Sep 17 00:00:00 2001 From: Faizaan Gagan Date: Wed, 16 Feb 2022 00:55:57 +0530 Subject: [PATCH 4/4] bump patch version --- plugin.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugin.rb b/plugin.rb index 0083ddd769..b1b3bbdbbf 100644 --- a/plugin.rb +++ b/plugin.rb @@ -1,7 +1,7 @@ # frozen_string_literal: true # name: discourse-custom-wizard # about: Create custom wizards -# version: 1.18.0 +# version: 1.18.1 # authors: Angus McLeod # url: https://github.com/paviliondev/discourse-custom-wizard # contact emails: angus@thepavilion.io