Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7d6bd62cfa |
@@ -1,91 +0,0 @@
|
|||||||
when:
|
|
||||||
- event: [push, manual, pull_request]
|
|
||||||
branch: [main]
|
|
||||||
|
|
||||||
services:
|
|
||||||
docker:
|
|
||||||
image: docker:28-dind
|
|
||||||
privileged: true
|
|
||||||
environment:
|
|
||||||
DOCKER_TLS_CERTDIR: ""
|
|
||||||
|
|
||||||
steps:
|
|
||||||
prepare-fe-image-tags:
|
|
||||||
image: alpine:3.21
|
|
||||||
commands:
|
|
||||||
- |
|
|
||||||
COMMIT_SHA="${CI_COMMIT_SHA:-${CI_COMMIT:-${DRONE_COMMIT_SHA:-${DRONE_COMMIT:-}}}}"
|
|
||||||
if [ -n "$COMMIT_SHA" ]; then
|
|
||||||
IMAGE_TAG="$(printf '%s' "$COMMIT_SHA" | cut -c1-8)"
|
|
||||||
else
|
|
||||||
REF_NAME="${CI_COMMIT_REF:-${CI_COMMIT_BRANCH:-manual}}"
|
|
||||||
REF_NAME="${REF_NAME#refs/heads/}"
|
|
||||||
REF_NAME="$(printf '%s' "$REF_NAME" | sed 's#[^A-Za-z0-9_.-]#-#g')"
|
|
||||||
IMAGE_TAG="$(printf '%s' "${REF_NAME:-manual}-${CI_PIPELINE_NUMBER:-0}" | cut -c1-32)"
|
|
||||||
fi
|
|
||||||
echo "Using frontend image tag: $IMAGE_TAG"
|
|
||||||
printf '%s\n' "$IMAGE_TAG" > .fe-tags
|
|
||||||
printf '%s\n' "latest" >> .fe-tags
|
|
||||||
printf '%s\n' "$IMAGE_TAG" > .e2e-tags
|
|
||||||
printf '%s\n' "latest" >> .e2e-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
|
|
||||||
|
|
||||||
build-and-push-e2e-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}-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-fe-image
|
|
||||||
- build-and-push-e2e-image
|
|
||||||
environment:
|
|
||||||
DOCKER_HOST: tcp://docker:2375
|
|
||||||
DOCKER_TLS_CERTDIR: ""
|
|
||||||
GITEA_PACKAGES_USERNAME:
|
|
||||||
from_secret: gitea_packages_username
|
|
||||||
GITEA_PACKAGES_TOKEN:
|
|
||||||
from_secret: gitea_packages_token
|
|
||||||
GHCR_IO_REGISTRY_USERNAME:
|
|
||||||
from_secret: ghcr_io_registry_username
|
|
||||||
GHCR_IO_REGISTRY_TOKEN:
|
|
||||||
from_secret: ghcr_io_registry_token
|
|
||||||
commands:
|
|
||||||
- |
|
|
||||||
IMAGE_TAG="$(head -n1 .fe-tags)"
|
|
||||||
export FRONTEND_IMAGE="git.cluster.lab.kemkas.hu/${CI_REPO}:$${IMAGE_TAG}"
|
|
||||||
export E2E_IMAGE="git.cluster.lab.kemkas.hu/${CI_REPO}-e2e:$${IMAGE_TAG}"
|
|
||||||
echo "Using image tag: $${IMAGE_TAG}"
|
|
||||||
printf '%s' "$${GITEA_PACKAGES_TOKEN}" | docker login git.cluster.lab.kemkas.hu -u "$${GITEA_PACKAGES_USERNAME}" --password-stdin
|
|
||||||
printf '%s' "$${GHCR_IO_REGISTRY_TOKEN}" | docker login ghcr.io -u "$${GHCR_IO_REGISTRY_USERNAME}" --password-stdin
|
|
||||||
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) {
|
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;
|
//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
|
||||||
// thief-specific extra selections are handled elsewhere and are not part of this default max.
|
|
||||||
let numberOfKepzettseg = 3 + Modifier(t_int) + (faj === Faj2E.Ember ? 1 : 0)
|
let numberOfKepzettseg = 3 + Modifier(t_int) + (faj === Faj2E.Ember ? 1 : 0)
|
||||||
|
|
||||||
if (numberOfKepzettseg < 1) {
|
if (numberOfKepzettseg < 1) {
|
||||||
|
|||||||
Reference in New Issue
Block a user