Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7d6bd62cfa |
@@ -1,27 +0,0 @@
|
||||
when:
|
||||
- event: [push, manual]
|
||||
branch: [main]
|
||||
|
||||
steps:
|
||||
prepare-fe-image-tags:
|
||||
image: alpine:3.21
|
||||
commands:
|
||||
- SHORT_SHA="$(echo "$CI_COMMIT_SHA" | cut -c1-8)"
|
||||
- printf '%s\n' "$SHORT_SHA" > .fe-tags
|
||||
- printf '%s\n' "latest" >> .fe-tags
|
||||
|
||||
build-and-push-fe-image:
|
||||
image: docker.io/woodpeckerci/plugin-docker-buildx:latest
|
||||
privileged: true
|
||||
depends_on:
|
||||
- prepare-fe-image-tags
|
||||
settings:
|
||||
registry: git.cluster.lab.kemkas.hu
|
||||
repo: git.cluster.lab.kemkas.hu/${CI_REPO}
|
||||
context: frontend
|
||||
dockerfile: frontend/Dockerfile
|
||||
tags_file: .fe-tags
|
||||
username:
|
||||
from_secret: gitea_packages_username
|
||||
password:
|
||||
from_secret: gitea_packages_token
|
||||
@@ -1,60 +0,0 @@
|
||||
when:
|
||||
- event: [push, manual]
|
||||
branch: [main]
|
||||
|
||||
steps:
|
||||
prepare-e2e-image-tags:
|
||||
image: alpine:3.21
|
||||
commands:
|
||||
- SHORT_SHA="$(echo "$CI_COMMIT_SHA" | cut -c1-8)"
|
||||
- printf '%s\n' "$SHORT_SHA" > .e2e-tags
|
||||
- printf '%s\n' "latest" >> .e2e-tags
|
||||
|
||||
build-and-push-e2e-image:
|
||||
image: docker.io/woodpeckerci/plugin-docker-buildx:latest
|
||||
privileged: true
|
||||
depends_on:
|
||||
- prepare-e2e-image-tags
|
||||
settings:
|
||||
registry: git.cluster.lab.kemkas.hu
|
||||
repo: git.cluster.lab.kemkas.hu/${CI_REPO}-e2e
|
||||
context: e2e
|
||||
dockerfile: e2e/Dockerfile
|
||||
tags_file: .e2e-tags
|
||||
username:
|
||||
from_secret: gitea_packages_username
|
||||
password:
|
||||
from_secret: gitea_packages_token
|
||||
|
||||
run-e2e:
|
||||
image: docker:28-cli
|
||||
privileged: true
|
||||
depends_on:
|
||||
- build-and-push-e2e-image
|
||||
environment:
|
||||
GITEA_PACKAGES_USERNAME:
|
||||
from_secret: gitea_packages_username
|
||||
GITEA_PACKAGES_TOKEN:
|
||||
from_secret: gitea_packages_token
|
||||
commands:
|
||||
- SHORT_SHA="$(echo "$CI_COMMIT_SHA" | cut -c1-8)"
|
||||
- export FRONTEND_IMAGE="git.cluster.lab.kemkas.hu/${CI_REPO}:${SHORT_SHA}"
|
||||
- export E2E_IMAGE="git.cluster.lab.kemkas.hu/${CI_REPO}-e2e:${SHORT_SHA}"
|
||||
- docker login git.cluster.lab.kemkas.hu -u "$GITEA_PACKAGES_USERNAME" -p "$GITEA_PACKAGES_TOKEN"
|
||||
- |
|
||||
for i in $(seq 1 30); do
|
||||
if docker manifest inspect "$FRONTEND_IMAGE" >/dev/null 2>&1; then
|
||||
break
|
||||
fi
|
||||
|
||||
if [ "$i" -eq 30 ]; then
|
||||
echo "Frontend image not available: $FRONTEND_IMAGE"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
echo "Waiting for frontend image: $FRONTEND_IMAGE"
|
||||
sleep 10
|
||||
done
|
||||
- trap 'docker compose -f e2e.docker-compose.yaml down -v --remove-orphans' EXIT
|
||||
- docker compose -f e2e.docker-compose.yaml pull
|
||||
- docker compose -f e2e.docker-compose.yaml up --no-build --abort-on-container-exit --exit-code-from e2e e2e
|
||||
@@ -1,14 +0,0 @@
|
||||
when:
|
||||
- event: [push, pull_request, manual]
|
||||
branch: [main]
|
||||
|
||||
steps:
|
||||
unit-test-and-lint:
|
||||
image: node:24
|
||||
commands:
|
||||
- corepack enable
|
||||
- corepack prepare yarn@1.22.22 --activate
|
||||
- cd frontend
|
||||
- yarn install --frozen-lockfile
|
||||
- yarn run test
|
||||
- yarn run lint
|
||||
@@ -13,8 +13,7 @@ function availableKezpettsegListFajjal(faj: Faj2E, ...osztalyok: Osztaly2E[]): K
|
||||
}
|
||||
|
||||
export function GetNumberOfKepzettsegek(t_int: number, faj: Faj2E, max: number = 11) {
|
||||
// Default cap is 11. Base calculation is 3 + 1 (human) + 3 (max ability modifier) = 7;
|
||||
// thief-specific extra selections are handled elsewhere and are not part of this default max.
|
||||
//max = 3 + 1 + 3 + 4 + 2 = 13 // 3 base, 1 human, 3 from max ability modifier, 4 from Thief +1 at 5th and +1 at 9th level
|
||||
let numberOfKepzettseg = 3 + Modifier(t_int) + (faj === Faj2E.Ember ? 1 : 0)
|
||||
|
||||
if (numberOfKepzettseg < 1) {
|
||||
|
||||
Reference in New Issue
Block a user