Merge branch 'main' into devel

This commit is contained in:
Thilo Hohlt
2024-09-15 22:42:50 +02:00
committed by GitHub

View File

@@ -13,7 +13,7 @@ env:
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.event != 'pull_request' }} if: ${{ github.event.workflow_run.conclusion == 'success' && github.event.workflow_run.event != 'pull_request' }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@@ -25,15 +25,15 @@ jobs:
- name: Install SSH Key - name: Install SSH Key
uses: shimataro/ssh-key-action@v2 uses: shimataro/ssh-key-action@v2
with: with:
key: ${{ github.ref_name == 'devel' && secrets.QS_SSH_KEY || secrets.PROD_SSH_KEY }} key: ${{ github.event.workflow_run.head_branch == 'devel' && secrets.QS_SSH_KEY || secrets.PROD_SSH_KEY }}
known_hosts: ${{ github.ref_name == 'devel' && secrets.QS_KNOWN_HOSTS || secrets.PROD_KNOWN_HOSTS }} known_hosts: ${{ github.event.workflow_run.head_branch == 'devel' && secrets.QS_KNOWN_HOSTS || secrets.PROD_KNOWN_HOSTS }}
- name: Deploy to demo server - name: Deploy to demo server
run: | run: |
nix run nixpkgs#nixos-rebuild -- switch \ nix run nixpkgs#nixos-rebuild -- switch \
--flake github:archtika/archtika/${{ github.ref_name }}#${{ github.ref_name == 'devel' && 'qs' || 'prod' }} \ --flake github:archtika/archtika/${{ github.event.workflow_run.head_branch }}#${{ github.event.workflow_run.head_branch == 'devel' && 'qs' || 'prod' }} \
--fast \ --fast \
--refresh \ --refresh \
--build-host ${{ env.SERVER_USER }}@${{ github.ref_name == 'devel' && env.QS_SERVER_IP || env.PROD_SERVER_IP }} \ --build-host ${{ env.SERVER_USER }}@${{ github.event.workflow_run.head_branch == 'devel' && env.QS_SERVER_IP || env.PROD_SERVER_IP }} \
--target-host ${{ env.SERVER_USER }}@${{ github.ref_name == 'devel' && env.QS_SERVER_IP || env.PROD_SERVER_IP }} \ --target-host ${{ env.SERVER_USER }}@${{ github.event.workflow_run.head_branch == 'devel' && env.QS_SERVER_IP || env.PROD_SERVER_IP }} \
--use-remote-sudo --use-remote-sudo