From 5949c267723ac605127c52d96a20f40132116622 Mon Sep 17 00:00:00 2001 From: Goooler Date: Tue, 10 Dec 2024 15:11:28 +0800 Subject: [PATCH] Fix --- .github/workflows/ci.yml | 39 +------------------ .github/workflows/release.yml | 4 +- .../shadow.convention.deploy.gradle.kts | 2 +- 3 files changed, 5 insertions(+), 40 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 12f1c1cee..e7275372b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -8,22 +8,6 @@ on: workflow_dispatch: jobs: - build: - strategy: - matrix: - os: [ ubuntu-latest, windows-latest ] - # Always test on the latest version and some LTS. - java: [ 17, 21, 23 ] - runs-on: ${{ matrix.os }} - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: ${{ matrix.java }} - - uses: gradle/actions/setup-gradle@v4 - - run: ./gradlew build - deply-wbsites: runs-on: ubuntu-latest steps: @@ -37,8 +21,8 @@ jobs: cache-read-only: true - name: Set up Git run: | - git config user.name 'github-actions[bot]' - git config user.email 'github-actions[bot]@users.noreply.github.com' + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' - uses: actions/setup-node@v4 with: # Due to some limitations of https://github.com/node-gradle/gradle-node-plugin. @@ -46,22 +30,3 @@ jobs: - run: ./gradlew gitPublishPush --no-configuration-cache env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - publish-snapshot: - needs: build - runs-on: ubuntu-latest - if: github.repository == 'GradleUp/shadow' && github.ref == 'refs/heads/main' - steps: - - uses: actions/checkout@v4 - - uses: actions/setup-java@v4 - with: - distribution: 'zulu' - java-version: 21 - - uses: gradle/actions/setup-gradle@v4 - with: - cache-read-only: true - # Disable CC due to https://github.com/gradle/gradle/issues/22779 - - run: ./gradlew publish --no-configuration-cache - env: - ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.OSSRH_USER }} - ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.OSSRH_PASSWORD }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7cd0786a7..91791ea54 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -26,8 +26,8 @@ jobs: node-version: '16' - name: Set up Git run: | - git config user.name 'github-actions[bot]' - git config user.email 'github-actions[bot]@users.noreply.github.com' + git config --global user.name 'github-actions[bot]' + git config --global user.email 'github-actions[bot]@users.noreply.github.com' # Disable CC due to https://github.com/gradle/gradle/issues/22779 - run: ./gradlew releaseAll --no-configuration-cache env: diff --git a/build-logic/src/main/kotlin/shadow.convention.deploy.gradle.kts b/build-logic/src/main/kotlin/shadow.convention.deploy.gradle.kts index a444a7bfc..b7ec3003f 100644 --- a/build-logic/src/main/kotlin/shadow.convention.deploy.gradle.kts +++ b/build-logic/src/main/kotlin/shadow.convention.deploy.gradle.kts @@ -15,7 +15,7 @@ val yarnBuild = tasks.named("yarn_build") { gitPublish { repoUri = "https://github.com/GradleUp/shadow.git" branch = "gh-pages" - username = providers.environmentVariable("GITHUB_TOKEN") + password = providers.environmentVariable("GITHUB_TOKEN") contents { from(yarnBuild) from(tasks.dokkaHtml) {