Compare commits

..

No commits in common. "f9bc64d1ed4b156948700edb13cc17e4b045ba04" and "745ce5bfca9a933e9fc71f267ee53b6b85599d59" have entirely different histories.

3 changed files with 21 additions and 33 deletions

View file

@ -1,18 +1,15 @@
name: Deploy (Production) name: Deploy (Production)
on: on: workflow_dispatch
workflow_dispatch:
inputs:
hostname:
description: Hostname
type: string
required: true
default: antville.org
jobs: jobs:
deploy: deploy:
runs-on: antville runs-on: antville
environment:
name: antville.org
url: https://antville.org
steps: steps:
- name: Copy files to production server - name: Copy files to production server
run: ssh ${{ inputs.hostname }} deploy-helma run: ssh staging-server deploy-helma

View file

@ -1,13 +1,6 @@
name: Deploy (Staging) name: Deploy (Staging)
on: on: workflow_dispatch
workflow_dispatch:
inputs:
hostname:
description: Hostname
type: string
required: true
default: antville.org
jobs: jobs:
stage: stage:
@ -15,7 +8,7 @@ jobs:
environment: environment:
name: stage name: stage
url: ${{ inputs.hostname }} url: ${{ vars.stage_url }}
steps: steps:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
@ -23,9 +16,9 @@ jobs:
- name: Build with Gradle - name: Build with Gradle
run: ./gradlew installDist run: ./gradlew installDist
- name: Copy build files to server - name: Publish to staging server
run: | run: |
rsync ./build/install/helma/ ${{ inputs.hostname }}:./ \ rsync ./build/install/helma/ staging-server:./ \
--verbose --archive --delete --compress \ --verbose --archive --delete --compress \
--filter '+ /bin' \ --filter '+ /bin' \
--filter '+ /extras' \ --filter '+ /extras' \
@ -36,4 +29,4 @@ jobs:
--filter '- /*' --filter '- /*'
- name: Restart Helma - name: Restart Helma
run: ssh ${{ inputs.hostname }} restart run: ssh staging-server restart

22
.gitignore vendored
View file

@ -1,7 +1,5 @@
# Generally ignore hidden files
.* .*
# Manage some Codium configuration
.vscode/* .vscode/*
!.vscode !.vscode
!.vscode/extensions.json !.vscode/extensions.json
@ -9,22 +7,22 @@
!.vscode/settings.json !.vscode/settings.json
!.vscode/tasks.json !.vscode/tasks.json
# Ignore files created during build or run build
/apps
/bin /bin
/backups /backups
build /db
/docs /docs
/extras
/lib /lib
/licenses /licenses
/log /log
# Ignore files managed in src/dist
/*.properties
/apps
/db
/extras
/launcher.jar
/static /static
# Manage Gradle configuration /*.properties
!/gradle.properties !/gradle.properties
/launcher.jar
/passwd
/start.*