diff --git a/.forgejo/workflows/main.yaml b/.forgejo/workflows/main.yaml index a4acf13..c74d14a 100644 --- a/.forgejo/workflows/main.yaml +++ b/.forgejo/workflows/main.yaml @@ -1,12 +1,10 @@ --- -name: 'main' - on: push: workflow_dispatch: jobs: - main: + test: runs-on: 'self-hosted' steps: - uses: 'actions/checkout@v4' @@ -18,7 +16,17 @@ jobs: make tidy no-dirty - name: 'check' run: | - make check no-dirty + make check tidy no-dirty + build: + if: "${{ startsWith(github.ref, 'refs/tags/') }}" + needs: + - 'test' + runs-on: 'self-hosted' + steps: + - uses: 'actions/checkout@v4' + - uses: 'actions/setup-go@v5' + with: + go-version-file: 'go.mod' - name: 'build' run: | printf '%s' "$GIT_CRYPT_SECRET" | base64 -d > secret @@ -26,35 +34,33 @@ jobs: make build env: GIT_CRYPT_SECRET: '${{ secrets.GIT_CRYPT }}' - #- uses: 'actions/upload-artifact@v4' - - uses: 'forgejo/upload-artifact@v4' - if: "${{ startsWith(github.ref, 'refs/tags/') }}" + - uses: 'actions/upload-artifact@v3' with: if-no-files-found: 'error' name: 'ods' path: 'ods' deploy: - if: "${{ startsWith(github.ref, 'refs/tags/') }}" needs: - - 'main' + - 'build' runs-on: 'self-hosted' steps: - #- uses: 'actions/download-artifact@v4' - - uses: 'forgejo/download-artifact@v4' + - uses: 'actions/download-artifact@v3' with: name: 'ods' - run: | - make deploy + umask 077 + printf '%s' "$SSH_PRIVATE_KEY" | base64 -d > private_key + SSHOPTS="-i private_key -o StrictHostKeyChecking=accept-new" + rsync -e "ssh ${SSHOPTS}" ods ods@ods.adyxax.org: + ssh ${SSHOPTS} ods@ods.adyxax.org "chmod +x ods; systemctl --user restart ods" env: SSH_PRIVATE_KEY: '${{ secrets.SSH_PRIVATE_KEY }}' publish: - if: "${{ startsWith(github.ref, 'refs/tags/') }}" needs: - - 'main' + - 'build' runs-on: 'self-hosted' steps: - #- uses: 'actions/download-artifact@v4' - - uses: 'forgejo/download-artifact@v4' + - uses: 'actions/download-artifact@v3' with: name: 'ods' - uses: 'actions/forgejo-release@v2' @@ -65,4 +71,4 @@ jobs: release-dir: './' token: '${{ env.GITHUB_TOKEN }}' hide-archive-link: true - prerelease: false + release-notes-assistant: true diff --git a/CHANGELOG.md b/CHANGELOG.md index 0984382..86e70f2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,12 +2,6 @@ All notable changes to this project will be documented in this file. -## 1.0.1 - 2024-04-07 - -### Changed - -- Upgrade dependencies. - ## 1.0.0 - 2025-03-15 ### Added diff --git a/GNUmakefile b/GNUmakefile index 3695969..483f13b 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -37,17 +37,8 @@ push: tidy no-dirty check ## push changes to git remote .PHONY: deploy deploy: build ## deploy changes to the production server - umask 077 - if [ -n "$${SSH_PRIVATE_KEY:-}" ]; then - cleanup() { - rm -f private_key - } - trap cleanup EXIT - printf '%s' "$$SSH_PRIVATE_KEY" | base64 -d > private_key - SSHOPTS="-i private_key -o StrictHostKeyChecking=accept-new" - fi - rsync -e "ssh $${SSHOPTS:-}" ./ods ods@ods.adyxax.org: - ssh $${SSHOPTS:-} ods@ods.adyxax.org "chmod +x ods; systemctl --user restart ods" + rsync ./ods root@ods.adyxax.org:/usr/local/bin/ + ssh root@ods.adyxax.org "systemctl restart ods" ##### Utils #################################################################### .PHONY: confirm diff --git a/README.md b/README.md index f450fe1..f5f82b8 100644 --- a/README.md +++ b/README.md @@ -16,13 +16,6 @@ help` if running BSD) to see the possible actions. Use `make build` to build a static binary of the service, embedding everything. -## Configuration - -ODS can be configured by setting the following environment variables: -- `ODS_DEBUG`: Set this to a non empty string to activate debug logs. -- `ODS_HOST`: Hostname or address to listen on, defaults to `127.0.0.1`. -- `ODS_PORT`: TCP port to listen on, defaults to `8080`. - ## The dictionary The "Officiel Du Scrabble" (ODS for short) is what the official dictionary for @@ -46,9 +39,6 @@ Description=ods.adyxax.org service Environment="ODS_PORT=8090" ExecStart=/usr/local/bin/ods Type=simple - -[Install] -WantedBy=default.target ``` ## Nginx reverse proxy diff --git a/go.mod b/go.mod index 9dde400..239321e 100644 --- a/go.mod +++ b/go.mod @@ -1,5 +1,5 @@ module git.adyxax.org/adyxax/ods -go 1.24.2 +go 1.24.1 -require golang.org/x/text v0.24.0 +require golang.org/x/text v0.23.0 diff --git a/go.sum b/go.sum index 5b77acb..d00bb39 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,2 @@ -golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0= -golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=