diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 9b0cfe5..a31c6fb 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -13,7 +13,7 @@ env: jobs: deploy: 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: - uses: actions/checkout@v4 @@ -25,15 +25,15 @@ jobs: - name: Install SSH Key uses: shimataro/ssh-key-action@v2 with: - key: ${{ github.ref_name == 'devel' && secrets.QS_SSH_KEY || secrets.PROD_SSH_KEY }} - known_hosts: ${{ github.ref_name == 'devel' && secrets.QS_KNOWN_HOSTS || secrets.PROD_KNOWN_HOSTS }} + key: ${{ github.event.workflow_run.head_branch == 'devel' && secrets.QS_SSH_KEY || secrets.PROD_SSH_KEY }} + known_hosts: ${{ github.event.workflow_run.head_branch == 'devel' && secrets.QS_KNOWN_HOSTS || secrets.PROD_KNOWN_HOSTS }} - name: Deploy to demo server run: | 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 \ --refresh \ - --build-host ${{ env.SERVER_USER }}@${{ github.ref_name == '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 }} \ + --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.event.workflow_run.head_branch == 'devel' && env.QS_SERVER_IP || env.PROD_SERVER_IP }} \ --use-remote-sudo