Skip to content

Commit 038604e

Browse files
authored
FIX: checkout correct branches of plugin and discourse (#182)
* FIX: checkout correct branches of plugin and discourse * add condition to check correct discourse branch * FIX: use updated redis version * bump patch version
1 parent dcefd7c commit 038604e

File tree

2 files changed

+11
-3
lines changed

2 files changed

+11
-3
lines changed

.github/workflows/plugin-tests.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
build_type: ["backend", "frontend"]
3232
ruby: ["2.7"]
3333
postgres: ["12"]
34-
redis: ["4.x"]
34+
redis: ["6.x"]
3535

3636
services:
3737
postgres:
@@ -49,10 +49,17 @@ jobs:
4949
--health-retries 5
5050
5151
steps:
52+
- uses: haya14busa/action-cond@v1
53+
id: discourse_branch
54+
with:
55+
cond: ${{ github.base_ref == 'stable' }}
56+
if_true: "stable"
57+
if_false: "tests-passed"
58+
5259
- uses: actions/checkout@v2
5360
with:
5461
repository: discourse/discourse
55-
ref: "${{ (github.base_ref || github.ref) }}"
62+
ref: ${{ steps.discourse_branch.outputs.value }}
5663
fetch-depth: 1
5764

5865
- name: Fetch Repo Name
@@ -63,6 +70,7 @@ jobs:
6370
uses: actions/checkout@v2
6471
with:
6572
path: plugins/${{ steps.repo-name.outputs.value }}
73+
ref: "${{ github.base_ref }}"
6674
fetch-depth: 1
6775

6876
- name: Check spec existence

plugin.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# frozen_string_literal: true
22
# name: discourse-custom-wizard
33
# about: Create custom wizards
4-
# version: 1.18.0
4+
# version: 1.18.1
55
# authors: Angus McLeod
66
# url: https://github.com/paviliondev/discourse-custom-wizard
77
# contact emails: angus@thepavilion.io

0 commit comments

Comments
 (0)