diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 0eeddde..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,39 +0,0 @@ -build-android: - image: golang:1.26.2-bookworm - before_script: | - apt update && apt install -y openjdk-17-jdk-headless unzip curl rsync patch - /usr/lib/jvm/java-17-openjdk-amd64/bin/java --version - mkdir -p ~/.ssh && ssh-keyscan -p 22 -t rsa,ed25519 git.inker.bot >> ~/.ssh/known_hosts - cache: - - paths: - - $HOME/.gradle - - $HOME/go - script: | - export version="$(git describe --tags)-$CI_COMMIT_SHORT_SHA" && echo "building version $version" - bash ./setup-ndk.sh - bin/update && bin/apply-ci && cd works/core - git submodule update --init --recursive - git tag v$version -f - make lib_install - export PATH="$PATH:$(go env GOPATH)/bin" - go mod tidy - make lib_android - cd clients/android && git checkout dev && cd ../.. - go run -v ./cmd/internal/update_android_version --ci --nightly - mkdir clients/android/app/libs # start building - cp *.aar clients/android/app/libs - cd clients/android - echo "Gonna build with ANDROID_HOME=$ANDROID_HOME" - ANDROID_HOME="$HOME/Android/Sdk" ./gradlew :app:assembleOtherRelease :app:assembleOtherLegacyRelease - cd ../.. - mkdir -p dist # prepare upload - cp clients/android/app/build/outputs/apk/other/release/*.apk dist - cp clients/android/app/build/outputs/apk/otherLegacy/release/*.apk dist - VERSION_CODE=$(grep VERSION_CODE clients/android/version.properties | cut -d= -f2) - VERSION_NAME=$(grep VERSION_NAME clients/android/version.properties | cut -d= -f2) - variables: - ANDROID_NDK_VERSION: r28 - LOCAL_PROPERTIES: "S0VZU1RPUkVfUEFTUz0xMTQ1MTQKQUxJQVNfTkFNRT1hbGlhcwpBTElBU19QQVNTPTExNDUxNAo=" - artifacts: - paths: - - "./dist" diff --git a/bin/update b/bin/update index f04547e..fd892e2 100755 --- a/bin/update +++ b/bin/update @@ -8,10 +8,10 @@ REV_FILE="$ROOT/works/rev" # defaults REPO_URL="git@git.inker.bot:arknights/sing-box.git" -if [ ! -z "$CI_JOB_TOKEN" ]; then +if [ ! -z "$DEPLOY_TOKEN" ]; then git config --global user.name imabot git config --global user.email ci@inker.bot - git config --global url."https://gitlab-ci-token:${CI_JOB_TOKEN}@git.inker.bot/".insteadOf "git@git.inker.bot:" + git config --global url."https://${DEPLOY_TOKEN_USER}:${DEPLOY_TOKEN}@git.inker.bot/".insteadOf "git@git.inker.bot:" fi UPSTREAM_BRANCH="main"