From 038604e2845d6e4d74357108cbc4067c1c093a40 Mon Sep 17 00:00:00 2001
From: Faizaan Gagan <fzngagan@gmail.com>
Date: Wed, 16 Feb 2022 19:44:56 +0530
Subject: [PATCH] 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
---
 .github/workflows/plugin-tests.yml | 12 ++++++++++--
 plugin.rb                          |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/plugin-tests.yml b/.github/workflows/plugin-tests.yml
index 855bdfec..aec4fa6c 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:
@@ -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 || github.ref) }}"
+          ref: ${{ steps.discourse_branch.outputs.value }}
           fetch-depth: 1
 
       - name: Fetch Repo Name
@@ -63,6 +70,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
diff --git a/plugin.rb b/plugin.rb
index 0083ddd7..b1b3bbdb 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