Merge pull request #645 from sigstore/cleanup-release

Cleanup CI
sigstore · Feb 28, 2024 · e91d7fe · e91d7fe
2 parents cfefd91 + 18343a0
commit e91d7fe
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 118 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -49,21 +49,18 @@ jobs:
 
     # at some point this should just be replaced with something that can bring up a sigstore test env
     - name: Install Fulcio
-      run: |
-          go install github.com/sigstore/fulcio@main
+      run: go install github.com/sigstore/fulcio@main
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
 
     - name: Test sigstore-java
-      uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
-      with:
-        arguments: build
+      run: ./gradlew build
 
     - name: Ensure sigstore-java self signing still works
-      uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
-      with:
-        arguments: sigstore-java:publishToMavenLocal -Prelease -PskipPgpSigning
+      run: ./gradlew sigstore-java:publishToMavenLocal -Prelease -PskipPgpSigning
 
     - name: Test sigstore-java/sandbox
-      uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0 
-      with:
-        arguments: build
-        build-root-directory: sandbox
+      run: |
+        cd sandbox
+        ./gradlew build
diff --git a/.github/workflows/conformance.yml b/.github/workflows/conformance.yml
@@ -23,10 +23,11 @@ jobs:
           java-version: ${{ matrix.java-version }}
           distribution: 'temurin'
 
-      - name: Build sigstore-java
-        uses: gradle/gradle-build-action@a8f75513eafdebd8141bd1cd4e30fcd194af8dfa # v2.12.0
-        with:
-          arguments: :sigstore-cli:build
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v3
+
+      - name: Build sigstore-java cli
+        run: ./gradlew :sigstore-cli:build
 
       - name: Unpack sigstore-java distribution
         run: tar -xvf ${{ github.workspace }}/sigstore-cli/build/distributions/sigstore-cli-*.tar --strip-components 1

diff --git a/.github/workflows/release-sigstore-gradle-plugin-from-tag.yaml b/.github/workflows/release-sigstore-gradle-plugin-from-tag.yaml
@@ -34,11 +34,9 @@ jobs:
     permissions:
       id-token: write # To sign the artifacts
     runs-on: ubuntu-latest
-    needs: [ci, process-tag]
-    outputs:
-      hashes: ${{ steps.hash.outputs.hashes }}
+    needs: [ci]
     steps:
-      - name: checkout tag
+      - name: Checkout tag
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
 
       - name: Set up JDK 11
@@ -47,6 +45,9 @@ jobs:
           java-version: 11
           distribution: 'temurin'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+
       - name: Build, Sign and Release to Gradle Plugin Portal
         run: |
           ./gradlew publishPlugins -Prelease -Pgradle.publish.key=$GRADLE_PUBLISH_KEY -Pgradle.publish.secret=$GRADLE_PUBLISH_SECRET
@@ -56,63 +57,15 @@ jobs:
           GRADLE_PUBLISH_KEY: ${{ secrets.GRADLE_PUBLISH_KEY }}
           GRADLE_PUBLISH_SECRET: ${{ secrets.GRADLE_PUBLISH_SECRET }}
 
-      - name: SLSA -- Hash Artifacts
-        id: hash
-        run: |
-          mkdir slsa-files
-          cp sigstore-gradle/sigstore-gradle-sign-plugin/build/libs/*.jar slsa-files
-          cp sigstore-gradle/sigstore-gradle-sign-plugin/build/publications/pluginMaven/pom-default.xml slsa-files/sigstore-gradle-sign-plugin-${{ needs.process-tag.outputs.version }}.pom
-          cp sigstore-gradle/sigstore-gradle-sign-plugin/build/publications/pluginMaven/module.json slsa-files/sigstore-gradle-sign-plugin-${{ needs.process-tag.outputs.version }}.module
-          cp sigstore-gradle/sigstore-gradle-sign-base-plugin/build/libs/*.jar slsa-files
-          cp sigstore-gradle/sigstore-gradle-sign-base-plugin/build/publications/pluginMaven/pom-default.xml slsa-files/sigstore-gradle-sign-base-plugin-${{ needs.process-tag.outputs.version }}.pom
-          cp sigstore-gradle/sigstore-gradle-sign-base-plugin/build/publications/pluginMaven/module.json slsa-files/sigstore-gradle-sign-base-plugin-${{ needs.process-tag.outputs.version }}.module
-          cd slsa-files
-          echo "hashes=$(sha256sum ./* | base64 -w0)" >> $GITHUB_OUTPUT
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
-        with:
-          name: project-release-artifacts
-          path: ./slsa-files
-          if-no-files-found: error
-
-  provenance:
-    needs: [build, process-tag]
-    permissions:
-      actions: read # To read the workflow path.
-      id-token: write # To sign the provenance.
-      contents: write # To add assets to a release.
-    # use tags here: https://github.com/slsa-framework/slsa-github-generator#referencing-slsa-builders-and-generators
-    # remember to update "Download Attestations" when SLSA updates to actions/download-artifact@v4
-    uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
-    with:
-      provenance-name: "sigstore-gradle-sign-plugin-${{ needs.process-tag.outputs.version }}.attestation.intoto.jsonl"
-      base64-subjects: "${{ needs.build.outputs.hashes }}"
-
   create-release-on-github:
     runs-on: ubuntu-latest
-    needs: [provenance, build, process-tag]
+    needs: [build]
     permissions:
       contents: write
     steps:
-      - name: Download attestation
-        # keep at v3.x since slsa generator uses 3.x (update this when slsa-framework updates)
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: "${{ needs.provenance.outputs.attestation-name }}"
-          path: ./release/
-      - name: Copy attestation for base plugin
-        run: |
-          cp "./release/${{ needs.provenance.outputs.attestation-name }}" "./release/sigstore-gradle-sign-base-plugin-${{ needs.process-tag.outputs.version }}.attestation.intoto.jsonl"
-      - name: Download gradle release artifacts
-        uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
-        with:
-          name: project-release-artifacts
-          path: ./release/
       - name: Create release
         uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # tag=v0.1.15
         with:
-          tag_name: v${{ needs.process-tag.outputs.version }}
-          name: v${{ needs.process-tag.outputs.version }}-gradle
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}-gradle
           body: "See [CHANGELOG.md](https://github.com/${{ vars.GITHUB_REPOSITORY }}/blob/main/CHANGELOG.md) for more details."
-          files: ./release/*
diff --git a/.github/workflows/release-sigstore-java-from-tag.yaml b/.github/workflows/release-sigstore-java-from-tag.yaml
@@ -35,9 +35,7 @@ jobs:
     permissions:
       id-token: write # To sign the artifacts
     runs-on: ubuntu-latest
-    needs: [ci, process-tag]
-    outputs:
-      hashes: ${{ steps.hash.outputs.hashes }}
+    needs: [ci]
     steps:
       - name: checkout tag
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -48,6 +46,9 @@ jobs:
           java-version: 11
           distribution: 'temurin'
 
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@417ae3ccd767c252f5661f1ace9f835f9654f2b5 # v3.1.0
+
       - name: Build, Sign and Release to Maven Central
         run: |
           ./gradlew clean :sigstore-java:publishMavenJavaPublicationToSonatypeRepository -Prelease
@@ -57,56 +58,14 @@ jobs:
           ORG_GRADLE_PROJECT_sonatypeUsername: ${{ secrets.SONATYPE_USERNAME }}
           ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.SONATYPE_PASSWORD }}
 
-      - name: SLSA -- Hash Artifacts
-        id: hash
-        run: |
-          mkdir slsa-files
-          cp sigstore-java/build/libs/*.jar slsa-files
-          cp sigstore-java/build/publications/mavenJava/pom-default.xml slsa-files/sigstore-java-${{ needs.process-tag.outputs.version }}.pom
-          cp sigstore-java/build/publications/mavenJava/module.json slsa-files/sigstore-java-${{ needs.process-tag.outputs.version }}.module
-          cd slsa-files
-          echo "hashes=$(sha256sum ./* | base64 -w0)" >> $GITHUB_OUTPUT
-
-      - name: Upload build artifacts
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v4.3.1
-        with:
-          name: project-release-artifacts
-          path: ./slsa-files
-          if-no-files-found: error
-
-  provenance:
-    needs: [build, process-tag]
-    permissions:
-      actions: read # To read the workflow path.
-      id-token: write # To sign the provenance.
-      contents: write # To add assets to a release.
-    # use tags here: https://github.com/slsa-framework/slsa-github-generator#referencing-slsa-builders-and-generators
-    # remember to update "Download Attestations" when SLSA updates to actions/download-artifact@v4
-    uses: slsa-framework/slsa-github-generator/.github/workflows/[email protected]
-    with:
-      provenance-name: "sigstore-java-${{ needs.process-tag.outputs.version }}.attestation.intoto.jsonl"
-      base64-subjects: "${{ needs.build.outputs.hashes }}"
-
   create-release-on-github:
     runs-on: ubuntu-latest
-    needs: [provenance, build, process-tag]
+    needs: [build]
     permissions:
       contents: write
     steps:
-      - name: Download attestation
-        # keep at v3.x since slsa generator uses 3.x (update this when slsa-framework updates)
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
-        with:
-          name: "${{ needs.provenance.outputs.attestation-name }}"
-          path: ./release/
-      - name: Download gradle release artifacts
-        uses: actions/download-artifact@6b208ae046db98c579e8a3aa621ab581ff575935 # v4.1.1
-        with:
-          name: project-release-artifacts
-          path: ./release/
       - name: Create release
         uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844 # tag=v0.1.15
         with:
-          tag_name: v${{ needs.process-tag.outputs.version }}
+          tag_name: ${{ github.ref_name }}
           body: "See [CHANGELOG.md](https://github.com/${{ vars.GITHUB_REPOSITORY }}/blob/main/CHANGELOG.md) for more details."
-          files: ./release/*