From 5d2efbb1b0be799763f88fc86bba18721b9f10cc Mon Sep 17 00:00:00 2001 From: Ned Twigg Date: Mon, 8 Jul 2024 13:21:58 -0700 Subject: [PATCH] Automatically merge `release` into `main` and push it. --- .github/workflows/deploy.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index dc86b49..69f27e8 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -19,5 +19,9 @@ jobs: distribution: 'temurin' - name: gradle caching uses: gradle/gradle-build-action@v2 + - run: git fetch origin main - name: publish all - run: ./gradlew changelogPush -Prelease=true -Penable_publishing=true --stacktrace --warning-mode all \ No newline at end of file + run: ./gradlew changelogPush -Prelease=true -Penable_publishing=true --stacktrace --warning-mode all + - run: git checkout main + - run: git merge release --ff-only + - run: git push origin main \ No newline at end of file