Compare commits
6 commits
Author | SHA1 | Date | |
---|---|---|---|
5cacfdb574 | |||
060942051f | |||
605b195085 | |||
8ae98ee7c2 | |||
55168d4091 | |||
77b539522c |
6 changed files with 48 additions and 29 deletions
|
@ -1,10 +1,12 @@
|
||||||
---
|
---
|
||||||
|
name: 'main'
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
workflow_dispatch:
|
workflow_dispatch:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
test:
|
main:
|
||||||
runs-on: 'self-hosted'
|
runs-on: 'self-hosted'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/checkout@v4'
|
- uses: 'actions/checkout@v4'
|
||||||
|
@ -16,17 +18,7 @@ jobs:
|
||||||
make tidy no-dirty
|
make tidy no-dirty
|
||||||
- name: 'check'
|
- name: 'check'
|
||||||
run: |
|
run: |
|
||||||
make check tidy no-dirty
|
make check 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'
|
- name: 'build'
|
||||||
run: |
|
run: |
|
||||||
printf '%s' "$GIT_CRYPT_SECRET" | base64 -d > secret
|
printf '%s' "$GIT_CRYPT_SECRET" | base64 -d > secret
|
||||||
|
@ -34,33 +26,35 @@ jobs:
|
||||||
make build
|
make build
|
||||||
env:
|
env:
|
||||||
GIT_CRYPT_SECRET: '${{ secrets.GIT_CRYPT }}'
|
GIT_CRYPT_SECRET: '${{ secrets.GIT_CRYPT }}'
|
||||||
- uses: 'actions/upload-artifact@v3'
|
#- uses: 'actions/upload-artifact@v4'
|
||||||
|
- uses: 'forgejo/upload-artifact@v4'
|
||||||
|
if: "${{ startsWith(github.ref, 'refs/tags/') }}"
|
||||||
with:
|
with:
|
||||||
if-no-files-found: 'error'
|
if-no-files-found: 'error'
|
||||||
name: 'ods'
|
name: 'ods'
|
||||||
path: 'ods'
|
path: 'ods'
|
||||||
deploy:
|
deploy:
|
||||||
|
if: "${{ startsWith(github.ref, 'refs/tags/') }}"
|
||||||
needs:
|
needs:
|
||||||
- 'build'
|
- 'main'
|
||||||
runs-on: 'self-hosted'
|
runs-on: 'self-hosted'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/download-artifact@v3'
|
#- uses: 'actions/download-artifact@v4'
|
||||||
|
- uses: 'forgejo/download-artifact@v4'
|
||||||
with:
|
with:
|
||||||
name: 'ods'
|
name: 'ods'
|
||||||
- run: |
|
- run: |
|
||||||
umask 077
|
make deploy
|
||||||
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:
|
env:
|
||||||
SSH_PRIVATE_KEY: '${{ secrets.SSH_PRIVATE_KEY }}'
|
SSH_PRIVATE_KEY: '${{ secrets.SSH_PRIVATE_KEY }}'
|
||||||
publish:
|
publish:
|
||||||
|
if: "${{ startsWith(github.ref, 'refs/tags/') }}"
|
||||||
needs:
|
needs:
|
||||||
- 'build'
|
- 'main'
|
||||||
runs-on: 'self-hosted'
|
runs-on: 'self-hosted'
|
||||||
steps:
|
steps:
|
||||||
- uses: 'actions/download-artifact@v3'
|
#- uses: 'actions/download-artifact@v4'
|
||||||
|
- uses: 'forgejo/download-artifact@v4'
|
||||||
with:
|
with:
|
||||||
name: 'ods'
|
name: 'ods'
|
||||||
- uses: 'actions/forgejo-release@v2'
|
- uses: 'actions/forgejo-release@v2'
|
||||||
|
@ -71,4 +65,4 @@ jobs:
|
||||||
release-dir: './'
|
release-dir: './'
|
||||||
token: '${{ env.GITHUB_TOKEN }}'
|
token: '${{ env.GITHUB_TOKEN }}'
|
||||||
hide-archive-link: true
|
hide-archive-link: true
|
||||||
release-notes-assistant: true
|
prerelease: false
|
||||||
|
|
|
@ -2,6 +2,12 @@
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
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
|
## 1.0.0 - 2025-03-15
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
13
GNUmakefile
13
GNUmakefile
|
@ -37,8 +37,17 @@ push: tidy no-dirty check ## push changes to git remote
|
||||||
|
|
||||||
.PHONY: deploy
|
.PHONY: deploy
|
||||||
deploy: build ## deploy changes to the production server
|
deploy: build ## deploy changes to the production server
|
||||||
rsync ./ods root@ods.adyxax.org:/usr/local/bin/
|
umask 077
|
||||||
ssh root@ods.adyxax.org "systemctl restart ods"
|
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"
|
||||||
|
|
||||||
##### Utils ####################################################################
|
##### Utils ####################################################################
|
||||||
.PHONY: confirm
|
.PHONY: confirm
|
||||||
|
|
10
README.md
10
README.md
|
@ -16,6 +16,13 @@ help` if running BSD) to see the possible actions.
|
||||||
|
|
||||||
Use `make build` to build a static binary of the service, embedding everything.
|
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 dictionary
|
||||||
|
|
||||||
The "Officiel Du Scrabble" (ODS for short) is what the official dictionary for
|
The "Officiel Du Scrabble" (ODS for short) is what the official dictionary for
|
||||||
|
@ -39,6 +46,9 @@ Description=ods.adyxax.org service
|
||||||
Environment="ODS_PORT=8090"
|
Environment="ODS_PORT=8090"
|
||||||
ExecStart=/usr/local/bin/ods
|
ExecStart=/usr/local/bin/ods
|
||||||
Type=simple
|
Type=simple
|
||||||
|
|
||||||
|
[Install]
|
||||||
|
WantedBy=default.target
|
||||||
```
|
```
|
||||||
|
|
||||||
## Nginx reverse proxy
|
## Nginx reverse proxy
|
||||||
|
|
4
go.mod
4
go.mod
|
@ -1,5 +1,5 @@
|
||||||
module git.adyxax.org/adyxax/ods
|
module git.adyxax.org/adyxax/ods
|
||||||
|
|
||||||
go 1.24.1
|
go 1.24.2
|
||||||
|
|
||||||
require golang.org/x/text v0.23.0
|
require golang.org/x/text v0.24.0
|
||||||
|
|
4
go.sum
4
go.sum
|
@ -1,2 +1,2 @@
|
||||||
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
|
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
|
||||||
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
|
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
|
||||||
|
|
Loading…
Add table
Reference in a new issue