PR Annotations removed (#6735)

* pull_req instead of target * updates template to put description first * compensate for changes to versioning on interim builds --------- Signed-off-by: Justin Florentine <[email protected]> Co-authored-by: Sally MacFarlane <[email protected]>
hyperledger · Mar 15, 2024 · de0704a · de0704a
1 parent 9881e20
commit de0704a
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 49 deletions.
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,3 +1,10 @@
+## PR description
+
+## Fixed Issue(s)
+<!-- Please link to fixed issue(s) here using format: fixes #<issue number> -->
+<!-- Example: "fixes #2" -->
+
+
 ### Thanks for sending a pull request! Have you done the following?
 
 - [ ] Checked out our [contribution guidelines](https://github.com/hyperledger/besu/blob/main/CONTRIBUTING.md)?
@@ -12,9 +19,3 @@
 - [ ] locally run all integration tests via: `./gradlew integrationTest`
 - [ ] locally run all reference tests via: `./gradlew ethereum:referenceTests:referenceTests`
 
-
-## PR description
-
-## Fixed Issue(s)
-<!-- Please link to fixed issue(s) here using format: fixes #<issue number> -->
-<!-- Example: "fixes #2" -->
diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml
@@ -1,7 +1,7 @@
 name: acceptance-tests
 on:
   workflow_dispatch:
-  pull_request_target:
+  pull_request:
     branches:
       - main
       - release-*
@@ -70,12 +70,6 @@ jobs:
         with:
           name: acceptance-node-${{matrix.runner_index}}-test-results
           path: 'acceptance-tests/tests/build/test-results/**/TEST-*.xml'
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@5f47764eec0e1c1f19f40c8e60a5ba47e47015c5
-        if: (success() || failure()) # always run even if the build step fails
-        with:
-          report_paths: 'acceptance-tests/tests/build/test-results/**/TEST-*.xml'
-          annotate_only: true
   accepttests-passed:
     name: "accepttests-passed"
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/develop.yml b/.github/workflows/develop.yml
@@ -28,24 +28,14 @@ jobs:
       - name: assemble release
         run:
           ./gradlew assemble
-      - name: upload tarball
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
-        with:
-          path: 'build/distributions/besu*.tar.gz'
-          name: besu-develop.tar.gz
-          compression-level: 0
-      - name: hashes
-        id: hashes
+      - name: rename and hash files
         run: |
           cd build/distributions
+          mv besu*.zip besu-develop.zip
+          mv besu*.tar.gz besu-develop.tar.gz
           echo "zipSha=$(shasum -a 256 besu*.zip)" >> $GITHUB_OUTPUT
           echo "tarSha=$(shasum -a 256 besu*.tar.gz)" >> $GITHUB_OUTPUT
-      - name: upload zipfile
-        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
-        with:
-          path: 'build/distributions/besu*.zip'
-          name: besu-develop.zip
-          compression-level: 0
+          cd ../..
       - name: Upload Release assets
         uses: softprops/action-gh-release@de2c0eb89ae2a093876385947365aca7b0e5f844
         with:
@@ -55,8 +45,8 @@ jobs:
           fail_on_unmatched_files: true
           append_body: false
           files: |
-            build/distributions/besu*.tar.gz
-            build/distributions/besu*.zip
+            build/distributions/besu-develop.tar.gz
+            build/distributions/besu-develop.zip
           body: |
             This is an automated, bleeding edge build from the tip of ${{ github.ref_name }}. No promises. YOLO.
             

diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
@@ -1,7 +1,7 @@
 name: integration-tests
 on:
   workflow_dispatch:
-  pull_request_target:
+  pull_request:
     branches:
       - main
       - release-*
@@ -36,11 +36,5 @@ jobs:
           cache-disabled: true
       - name: run integration tests
         run: ./gradlew integrationTest compileJmh
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@5f47764eec0e1c1f19f40c8e60a5ba47e47015c5
-        if: (success() || failure())
-        with:
-          report_paths: '**/build/test-results/integrationTest/TEST-*.xml'
-          annotate_only: true
 
 
diff --git a/.github/workflows/pre-review.yml b/.github/workflows/pre-review.yml
@@ -1,7 +1,7 @@
 name: pre-review
 
 on:
-  pull_request_target:
+  pull_request:
     branches:
       - main
       - release-*
@@ -91,6 +91,22 @@ jobs:
           - "ethereum:api:testRemainder"
           - "ethereum:eth:test"
           - "ethereum:core:test"
+        #includes will need exact strings from gradle args above
+        include:
+          - gradle_args: "test -x besu:test -x consensus:test -x crypto:test -x ethereum:eth:test -x ethereum:api:test -x ethereum:core:test"
+            filename: "everythingElse"
+          - gradle_args: "besu:test consensus:test crypto:test"
+            filename: "consensusCrypto"
+          - gradle_args: "ethereum:api:testBonsai"
+            filename: "apiBonsai"
+          - gradle_args: "ethereum:api:testRemainder"
+            filename: "apiForest"
+          - gradle_args: "ethereum:api:testRemainder"
+            filename: "apiRemainder"
+          - gradle_args: "ethereum:eth:test"
+            filename: "eth"
+          - gradle_args: "ethereum:core:test"
+            filename: "core"
     steps:
       - name: Checkout Repo
         uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11
@@ -108,12 +124,11 @@ jobs:
       - name: run unit tests
         id: unitTest
         run: ./gradlew $GRADLEW_UNIT_TEST_ARGS
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@5f47764eec0e1c1f19f40c8e60a5ba47e47015c5
-        if: success() || failure() # always run even if the build step fails
+      - name: Upload Acceptance Test Results
+        uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3
         with:
-          report_paths: '**/test-results/**/TEST-*.xml'
-          annotate_only: true
+          name: unit-${{matrix.filename}}-test-results
+          path: '**/test-results/**/TEST-*.xml'
   unittests-passed:
     name: "unittests-passed"
     runs-on: ubuntu-22.04

diff --git a/.github/workflows/reference-tests.yml b/.github/workflows/reference-tests.yml
@@ -1,7 +1,7 @@
 name: reference-tests
 on:
   workflow_dispatch:
-  pull_request_target:
+  pull_request:
     branches:
       - main
       - release-*
@@ -62,12 +62,6 @@ jobs:
         with:
           name: reference-test-node-${{matrix.runner_index}}-results
           path: '**/build/test-results/referenceTests/TEST-*.xml'
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@5f47764eec0e1c1f19f40c8e60a5ba47e47015c5
-        if: success() || failure() # always run even if the build step fails
-        with:
-          report_paths: '**/build/test-results/referenceTests/TEST-*.xml'
-          annotate_only: true
   reftests-passed:
     name: "reftests-passed"
     runs-on: ubuntu-22.04