Compare commits

..

No commits in common. "22ee941ce0a0963285d1256d2e313f28b073b2cf" and "865c55cd18713dde4c5cbbbd58b3d0caac8ec661" have entirely different histories.

3 changed files with 20 additions and 16 deletions

View File

@ -11,23 +11,23 @@ env:
jobs: jobs:
test: test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240118 container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240117
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Run Test DB Script - name: Run Test DB Script
run: ./test_db.sh run: ./test_db.sh
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: actions/cache@v3
continue-on-error: false
with: with:
path: | path: |
~/.cargo/bin/ ~/.cargo/bin/
~/.cargo/registry/index/ ~/.cargo/registry/index/
~/.cargo/registry/cache/ ~/.cargo/registry/cache/
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-cargo-debug-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: Build - name: Build
run: | run: |
cargo build cargo build
@ -46,7 +46,7 @@ jobs:
deploy-staging: deploy-staging:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240118 container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240117
needs: [test] needs: [test]
if: github.ref == 'refs/heads/staging' if: github.ref == 'refs/heads/staging'
steps: steps:
@ -58,14 +58,16 @@ jobs:
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: actions/cache@v3
continue-on-error: false
with: with:
path: | path: |
~/.cargo/bin/ ~/.cargo/bin/
~/.cargo/registry/index/ ~/.cargo/registry/index/
~/.cargo/registry/cache/ ~/.cargo/registry/cache/
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-cargo-release-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: Build - name: Build
run: | run: |
@ -97,7 +99,7 @@ jobs:
deploy-main: deploy-main:
runs-on: ubuntu-latest runs-on: ubuntu-latest
container: git.hofer.link/ruderverein-donau-linz/rowing-ci:20240118 container: git.hofer.link/ruderverein-donau-linz/rowing-ci:latest
needs: [test] needs: [test]
if: github.ref == 'refs/heads/main' if: github.ref == 'refs/heads/main'
steps: steps:
@ -106,17 +108,19 @@ jobs:
- name: Run Test DB Script - name: Run Test DB Script
run: ./test_db.sh run: ./test_db.sh
- name: Set up cargo cache - name: Set up cargo cache
uses: actions/cache@v3 uses: actions/cache@v3
continue-on-error: false
with: with:
path: | path: |
~/.cargo/bin/ ~/.cargo/bin/
~/.cargo/registry/index/ ~/.cargo/registry/index/
~/.cargo/registry/cache/ ~/.cargo/registry/cache/
~/.cargo/git/db/ ~/.cargo/git/db/
target/ target/
key: ${{ runner.os }}-cargo-release-${{ hashFiles('**/Cargo.lock') }} key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
restore-keys: ${{ runner.os }}-cargo-
- name: Build - name: Build
run: | run: |

View File

@ -5,7 +5,6 @@
# 2. Tag the image: `docker tag <id> git.hofer.link/ruderverein-donau-linz/rowing-ci:<date>` # 2. Tag the image: `docker tag <id> git.hofer.link/ruderverein-donau-linz/rowing-ci:<date>`
# 3. Push the image: `docker push git.hofer.link/ruderverein-donau-linz/rowing-ci:<date>` # 3. Push the image: `docker push git.hofer.link/ruderverein-donau-linz/rowing-ci:<date>`
FROM rust:1.75.0 FROM rust:1.75.0
RUN apt-get update && apt-get install -y sqlite3 RUN apt-get update && apt-get install -y sqlite3
@ -21,6 +20,3 @@ RUN npx playwright install --with-deps
# deployment # deployment
RUN rustup target add x86_64-unknown-linux-musl RUN rustup target add x86_64-unknown-linux-musl
RUN apt-get install -y -qq pkg-config sshpass musl musl-tools curl gnupg libssl-dev RUN apt-get install -y -qq pkg-config sshpass musl musl-tools curl gnupg libssl-dev
# TEMPORARY act workaround (otherwise gitea cache is not working)
RUN apt-get install -y zstd

View File

@ -1,14 +1,17 @@
# Build # Build
## Frontend ## Frontend
1. `cd frontend` 1. `cd frontend`
2. `npm install` 2. `npm install`
3. `npm run (watch/build)` 3. `npm run (watch/build)`
# Run # Run
## Backend ## Backend
1. `cargo r` 1. `cargo r`
# Test # Test
## Frontend ## Frontend
- `npx playwright test --workers 1 --project firefox` - `npx playwright test --workers 1 --project firefox`
- Nice UI: `--ui` - Nice UI: `--ui`
@ -16,3 +19,4 @@
## Backend (Unit + Integration) ## Backend (Unit + Integration)
`cargo t` `cargo t`