thohlt/archtika
1
0
Fork 0
mirror of https://github.com/thiloho/archtika.git synced 2025-11-22 10:51:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9 from archtika/devel

Browse Source 
Update deploy action to not trigger on pull requests
This commit is contained in:
Thilo Hohlt
2024-09-14 21:56:58 +02:00
committed by GitHub
parent 42ba7dd12d f322ea7dbf
commit ff549ebe96
4 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.github/workflows/demo-server-deploy.yml → .github/workflows/deploy.yml vendored
View File

@@ -1,9 +1,10 @@
name: Deploy app to demo server (demo.archtika.com) name: Deploy app to server
on: on:
workflow_run: workflow_run:
workflows: [ 'Playwright tests' ] workflows: [ 'Playwright tests' ]
types: [ completed ] types: [ completed ]
branches: [ devel, main ]
env: env:
SERVER_USER: root SERVER_USER: root
SERVER_IP: 128.140.75.240 SERVER_IP: 128.140.75.240
@@ -11,7 +12,9 @@ env:
jobs: jobs:
deploy: deploy:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.event.workflow_run.conclusion == 'success' }} if: |
github.event.workflow_run.conclusion == 'success' &&
github.event.workflow_run.event == 'push'
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4

4
.github/workflows/playwright.yml → .github/workflows/test.yml vendored
View File

@@ -2,9 +2,9 @@ name: Playwright tests
on: on:
push: push:
branches: [ main ] branches: [ devel, main ]
pull_request: pull_request:
branches: [ main ] branches: [ devel, main ]
jobs: jobs:
test: test:

2
flake.nix
View File

@@ -61,7 +61,7 @@
api = { api = {
type = "app"; type = "app";
program = "${pkgs.writeShellScriptBin "api-setup" '' program = "${pkgs.writeShellScriptBin "api-setup" ''
JWT_SECRET=$(head -c 64 /dev/urandom | base64 | tr -d '/+=' | head -c 64) JWT_SECRET=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c64)
${pkgs.postgresql_16}/bin/psql postgres://postgres@localhost:15432/archtika -c "ALTER DATABASE archtika SET \"app.jwt_secret\" TO '$JWT_SECRET'" ${pkgs.postgresql_16}/bin/psql postgres://postgres@localhost:15432/archtika -c "ALTER DATABASE archtika SET \"app.jwt_secret\" TO '$JWT_SECRET'"

2
nix/module.nix
View File

@@ -102,7 +102,7 @@ in
}; };
script = '' script = ''
JWT_SECRET=$(head -c 64 /dev/urandom | base64 | tr -d '/+=' | head -c 64) JWT_SECRET=$(tr -dc 'A-Za-z0-9' < /dev/urandom | head -c64)
${pkgs.postgresql_16}/bin/psql postgres://postgres@localhost:5432/${cfg.databaseName} -c "ALTER DATABASE ${cfg.databaseName} SET \"app.jwt_secret\" TO '$JWT_SECRET'" ${pkgs.postgresql_16}/bin/psql postgres://postgres@localhost:5432/${cfg.databaseName} -c "ALTER DATABASE ${cfg.databaseName} SET \"app.jwt_secret\" TO '$JWT_SECRET'"