Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .github/workflows/deploy_qa.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
name: "Deploy Update to QA Server"

on:
workflow_dispatch:
inputs:
confirm_qa_deploy:
description: "Type QA to confirm QA deployment"
required: true
default: ""
push:
branches: [master]

Expand Down Expand Up @@ -103,8 +109,7 @@ jobs:
fi
deploy_update:
needs: build
# Only push to the QA server when built on the master branch
if: github.ref_name == 'master'
if: github.event_name == 'push' || (github.event_name == 'workflow_dispatch' && github.event.inputs.confirm_qa_deploy == 'QA')
runs-on: [self-hosted, thecombine]
steps:
- name: Harden Runner
Expand Down
8 changes: 7 additions & 1 deletion .github/workflows/installer_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ name: installer_release

on:
workflow_dispatch:
inputs:
confirm_upload:
description: "Type UP to confirm installer upload"
required: true
default: ""
workflow_run:
workflows: ["Deploy Update to Live Server"]
types:
Expand All @@ -13,7 +18,7 @@ permissions:
jobs:
make_installer:
runs-on: ubuntu-latest
if: ${{ github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success' }}
if: github.event_name == 'workflow_dispatch' || github.event.workflow_run.conclusion == 'success'
outputs:
release_tag: ${{ steps.release.outputs.tag }}
steps:
Expand Down Expand Up @@ -74,6 +79,7 @@ jobs:

upload_installer:
needs: make_installer
if: github.event_name == 'workflow_run' || (github.event_name == 'workflow_dispatch' && github.event.inputs.confirm_upload == 'UP')
runs-on: ubuntu-latest
steps:
# See https://docs.stepsecurity.io/harden-runner/getting-started/ for instructions on
Expand Down
Loading