diff --git a/.github/workflows/build-and-deploy.yml b/.github/workflows/build-and-deploy.yml index a0b99a2dc..da4f15ed7 100644 --- a/.github/workflows/build-and-deploy.yml +++ b/.github/workflows/build-and-deploy.yml @@ -12,9 +12,6 @@ jobs: os: [ windows, macos, ubuntu ] runs-on: ${{ matrix.os }}-latest timeout-minutes: 120 - concurrency: - group: ${{ github.workflow }}-build-${{ matrix.os }}-${{ github.event.number || github.ref }} - cancel-in-progress: false steps: - name: Checkout uses: DanySK/action-checkout@0.2.22 @@ -22,7 +19,8 @@ jobs: with: retries-on-failure: 3 build-command: >- - ./gradlew build --parallel +# ./gradlew build --parallel + true check-command: true deploy-command: >- ./gradlew uploadAllPublicationsToMavenCentralNexus close drop --parallel @@ -33,14 +31,14 @@ jobs: && !github.event.repository.fork && github.event_name != 'pull_request' }} - gradle-publish-secret: ${{ secrets.GRADLE_PUBLISH_SECRET }} - gradle-publish-key: ${{ secrets.GRADLE_PUBLISH_KEY }} maven-central-username: ${{ secrets.MAVEN_CENTRAL_USERNAME }} maven-central-password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} signing-key: ${{ secrets.SIGNING_KEY }} signing-password: ${{ secrets.SIGNING_PASSWORD }} # Performs a release if needed release: + permissions: + contents: write needs: - build runs-on: ubuntu-latest @@ -71,11 +69,7 @@ jobs: npx semantic-release should-run-codecov: false should-deploy: true - custom-secret-0: ${{ secrets.SURGE_LOGIN }} - custom-secret-1: ${{ secrets.SURGE_TOKEN }} github-token: ${{ secrets.DEPLOYMENT_TOKEN }} - gradle-publish-secret: ${{ secrets.GRADLE_PUBLISH_SECRET }} - gradle-publish-key: ${{ secrets.GRADLE_PUBLISH_KEY }} maven-central-username: ${{ secrets.MAVEN_CENTRAL_USERNAME }} maven-central-password: ${{ secrets.MAVEN_CENTRAL_PASSWORD }} signing-key: ${{ secrets.SIGNING_KEY }} diff --git a/build.gradle.kts b/build.gradle.kts index 41896083a..2f7679e19 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -20,7 +20,12 @@ plugins{ alias(libs.plugins.shadowJar) } +allprojects { + group = "org.protelis" +} + val Provider.id get() = get().pluginId + subprojects { repositories { mavenCentral() @@ -39,8 +44,6 @@ subprojects { apply(plugin = multiJvmTesting.id) } - group = "org.protelis" - val minJavaVersion = 11 multiJvm { jvmVersionForCompilation.set(minJavaVersion) @@ -111,8 +114,8 @@ subprojects { if (System.getenv("CI") == true.toString()) { signing { - val signingKey: String? by project - val signingPassword: String? by project + val signingKey: String by project + val signingPassword: String by project useInMemoryPgpKeys(signingKey, signingPassword) } }