diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml index ca34d96..66b9c82 100644 --- a/.gitea/workflows/build.yml +++ b/.gitea/workflows/build.yml @@ -13,14 +13,11 @@ jobs: steps: - name: Checkout run: | - git clone --depth 1 $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git . - git checkout $GITHUB_SHA + git clone --depth 1 https://oauth2:${{ secrets.RELEASE_TOKEN }}@git.lokili.xyz/${{ gitea.repository }}.git . - name: Setup Java 21 run: | curl -sL https://download.java.net/java/GA/jdk21.0.2/f2283984656d49d69e91c558476027ac/13/GPL/openjdk-21.0.2_linux-x64_bin.tar.gz | tar xz - echo "JAVA_HOME=$PWD/jdk-21.0.2" >> $GITHUB_ENV - echo "$PWD/jdk-21.0.2/bin" >> $GITHUB_PATH - name: Build & Test run: | diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml index 38cf9d6..c1c074b 100644 --- a/.gitea/workflows/release.yml +++ b/.gitea/workflows/release.yml @@ -12,7 +12,7 @@ jobs: steps: - name: Checkout run: | - git clone --depth 1 --branch $GITHUB_REF_NAME $GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git . + git clone --depth 1 --branch ${{ gitea.ref_name }} https://oauth2:${{ secrets.RELEASE_TOKEN }}@git.lokili.xyz/${{ gitea.repository }}.git . - name: Setup Java 21 run: | @@ -27,20 +27,23 @@ jobs: - name: Create Release run: | - VERSION=${GITHUB_REF_NAME#v} + VERSION=${{ gitea.ref_name }} + VERSION=${VERSION#v} JAR_FILE=$(ls build/libs/LoChat-*.jar | head -1) curl -X POST \ -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \ -H "Content-Type: application/json" \ - "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/releases" \ - -d "{\"tag_name\": \"$GITHUB_REF_NAME\", \"name\": \"LoChat $VERSION\", \"body\": \"Release $VERSION\"}" + "https://git.lokili.xyz/api/v1/repos/${{ gitea.repository }}/releases" \ + -d "{\"tag_name\": \"${{ gitea.ref_name }}\", \"name\": \"LoChat $VERSION\", \"body\": \"Release $VERSION\"}" + + sleep 2 RELEASE_ID=$(curl -s -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \ - "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/releases/tags/$GITHUB_REF_NAME" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2) + "https://git.lokili.xyz/api/v1/repos/${{ gitea.repository }}/releases/tags/${{ gitea.ref_name }}" | grep -o '"id":[0-9]*' | head -1 | cut -d: -f2) curl -X POST \ -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \ -H "Content-Type: application/octet-stream" \ - "$GITHUB_SERVER_URL/api/v1/repos/$GITHUB_REPOSITORY/releases/$RELEASE_ID/assets?name=LoChat-$VERSION.jar" \ + "https://git.lokili.xyz/api/v1/repos/${{ gitea.repository }}/releases/$RELEASE_ID/assets?name=LoChat-$VERSION.jar" \ --data-binary @"$JAR_FILE"