diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 56884e3d9811..06d7daff9da9 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -27,15 +27,18 @@ jobs: build-scan-terms-of-use-agree: "yes" - name: Set env run: | + git config --global user.email "ci@noreply.example.com" + git config --global user.name "github_actions" echo "RELEASE_TAG=${GITHUB_REF_NAME}-build" >> $GITHUB_ENV echo "RELEASE_TAG=${GITHUB_REF_NAME}-build" echo "RELEASE_VERSION=$(date +'%Y.%m.%d').X${GITHUB_RUN_NUMBER}-${GITHUB_REF_NAME}" >> $GITHUB_ENV - echo "${{ secrets.KEYSTORE_BASE64 }}" | openssl enc -d -base64 -in - -out ../bekeystore.jks + echo "${{ secrets.KEYSTORE_BASE64 }}" | openssl enc -d -base64 -in - -out bekeystore.jks - name: Build run: | + git submodule update --init --depth=10 cd work - ../scripts/applyPatches + ../scripts/applyPatches.sh gradle desktop:dist server:dist -Pbuildversion=${RELEASE_VERSION} cd .. diff --git a/jitpack.yml b/jitpack.yml index d1830f955b41..82585fca29e2 100644 --- a/jitpack.yml +++ b/jitpack.yml @@ -7,6 +7,6 @@ install: # - cd work/ && git fetch origin v145.1 && git reset --hard FETCH_HEAD && cd .. - git config --global user.email "ci@noreply.example.com" - git config --global user.name "jitpack" - - sh ./scripts/applyPatches.sh && cd work/ + - cd work/ && sh ../scripts/applyPatches.sh - ./gradlew publishToMavenLocal - echo -n > gradle.properties #zero out gradle.properties \ No newline at end of file