diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 37b5f6057d..18477c8953 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -29,7 +29,7 @@ variables: default: before_script: - - apk add --update build-base linux-headers curl ca-certificates python3 perl postgresql-client pkgconfig openssl-dev + - apk add --update build-base linux-headers curl ca-certificates python3 perl postgresql-client - curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - . "${HOME}/.cargo/env" - corepack enable @@ -45,9 +45,10 @@ auto_update: - apk add git - git config user.name 'GitLab CI' - git config user.email 'noreply@firefish.dev' - - git remote set-url origin "https://gitlab-ci-token:${CI_JOB_TOKEN}@firefish.dev/${CI_MERGE_REQUEST_SOURCE_PROJECT_PATH}" + - git remote set-url origin "https://gitlab-ci-token:${CI_JOB_TOKEN}@firefish.dev/${CI_MERGE_REQUEST_SOURCE_PROJECT_PATH}.git" - git fetch origin - git switch "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" + - git pull --ff # update pnpm lockfile - pnpm install # commit @@ -67,6 +68,7 @@ auto_update: git push --push-option=ci.skip origin "${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}" fi # update packages/backend-rs/src/model/entity + - apk install pkgconfig openssl openssl-dev libssl3 - cargo install sea-orm-cli - pnpm --filter backend run build:debug - pnpm run migrate