Skip to content

Commit

Permalink
Merge pull request #309 from ftsrg/reformat-fix
Browse files Browse the repository at this point in the history
Reformat fix
  • Loading branch information
leventeBajczi authored Oct 21, 2024
2 parents 1d6d1ea + e0868af commit 55c083c
Show file tree
Hide file tree
Showing 9 changed files with 69 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/actions/benchexec-report/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ runs:
then printf "\n| $task | " >> $GITHUB_OUTPUT
fi
lasttask="$task"
printf " $emoji ($correct / $incorrect / $all) [HTML](https://theta.mit.bme.hu/benchmark-results/${{ github.head_ref }}/$i/$(ls *.html))/[CSV](https://theta.mit.bme.hu/benchmark-results/${{ github.head_ref }}/$i/$(ls *.csv)) | " >> $GITHUB_OUTPUT
printf " $emoji ($correct / $incorrect / $all) [HTML](https://theta.mit.bme.hu/benchmark-results/${{ github.ref }}/$i/$(ls *.html))/[CSV](https://theta.mit.bme.hu/benchmark-results/${{ github.ref }}/$i/$(ls *.csv)) | " >> $GITHUB_OUTPUT
popd
else
rm -rf $i
Expand All @@ -68,7 +68,7 @@ runs:
with:
branch: gh-pages
folder: artifacts
target-folder: benchmark-results/${{ github.head_ref }}/
target-folder: benchmark-results/${{ github.ref }}/
single-commit: true
- name: Comment on PR
if: github.event_name == 'pull_request'
Expand Down
21 changes: 19 additions & 2 deletions .github/workflows/check-copyright.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
permissions: write-all

concurrency:
group: copyright-${{ github.head_ref }}
group: copyright-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand All @@ -17,4 +17,21 @@ jobs:
- name: Checkout repository
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- name: Check copyright
uses: ./.github/actions/check-copyright
uses: ./.github/actions/check-copyright
- name: Comment
if: failure() && github.event_name == 'pull_request'
uses: thollander/actions-comment-pull-request@dadb7667129e23f12ca3925c90dc5cd7121ab57e
continue-on-error: true # if we are in a fork, this will fail, but we don't care (tables will be missing)
with:
comment_tag: 'copyright'
mode: 'recreate'
message: |
:exclamation: Please run `./gradlew spotlessApply` on your branch to fix copyright headers.
- name: Delete Comment
if: github.event_name == 'pull_request'
uses: thollander/actions-comment-pull-request@dadb7667129e23f12ca3925c90dc5cd7121ab57e
continue-on-error: true # if we are in a fork, this will fail, but we don't care (tables will be missing)
with:
comment_tag: 'copyright'
mode: 'delete'
26 changes: 24 additions & 2 deletions .github/workflows/check-formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
permissions: write-all

concurrency:
group: formatting-${{ github.head_ref }}
group: formatting-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand All @@ -16,5 +16,27 @@ jobs:
steps:
- name: Checkout repository
uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 # v3.5.3
- name: Setup java 17
uses: actions/setup-java@5ffc13f4174014e2d4d4572b3d74c3fa61aeb2c2 # v3.11.0
with:
distribution: temurin
java-version: 17
- name: Checking formatting
uses: ./.github/actions/check-formatting
uses: ./.github/actions/check-formatting
- name: Comment
if: failure() && github.event_name == 'pull_request'
uses: thollander/actions-comment-pull-request@dadb7667129e23f12ca3925c90dc5cd7121ab57e
continue-on-error: true # if we are in a fork, this will fail, but we don't care (tables will be missing)
with:
comment_tag: 'reformat'
mode: 'recreate'
message: |
:exclamation: Please run `./gradlew spotlessApply` on your branch to fix formatting.
- name: Delete Comment
if: github.event_name == 'pull_request'
uses: thollander/actions-comment-pull-request@dadb7667129e23f12ca3925c90dc5cd7121ab57e
continue-on-error: true # if we are in a fork, this will fail, but we don't care (tables will be missing)
with:
comment_tag: 'reformat'
mode: 'delete'
21 changes: 19 additions & 2 deletions .github/workflows/check-version.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
types: [opened, synchronize, reopened]

concurrency:
group: version-${{ github.head_ref }}
group: version-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down Expand Up @@ -35,4 +35,21 @@ jobs:
if: ${{ steps.new_version.outputs.version == steps.master_version.outputs.version }}
run: |
echo "New version ${{ steps.new_version.outputs.version }} is NOT OK"
exit 1
exit 1
- name: Comment
if: failure() && github.event_name == 'pull_request'
uses: thollander/actions-comment-pull-request@dadb7667129e23f12ca3925c90dc5cd7121ab57e
continue-on-error: true # if we are in a fork, this will fail, but we don't care (tables will be missing)
with:
comment_tag: 'version'
mode: 'recreate'
message: |
:exclamation: Please modify `build.gradle.kts` to contain a later version than ${{ steps.master_version.outputs.version }}. Current version is ${{ steps.new_version.outputs.version }}.
- name: Delete Comment
if: github.event_name == 'pull_request'
uses: thollander/actions-comment-pull-request@dadb7667129e23f12ca3925c90dc5cd7121ab57e
continue-on-error: true # if we are in a fork, this will fail, but we don't care (tables will be missing)
with:
comment_tag: 'version'
mode: 'delete'
2 changes: 1 addition & 1 deletion .github/workflows/linux-build-test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ on:
permissions: write-all

concurrency:
group: deploy-${{ github.head_ref }}-${{ github.event_name }}
group: deploy-${{ github.ref }}-${{ github.event_name }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mac-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
permissions: write-all

concurrency:
group: mac-${{ github.head_ref }}
group: mac-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonar.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ on:
permissions: read-all

concurrency:
group: sonar-${{ github.head_ref }}
group: sonar-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/win-build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
permissions: write-all

concurrency:
group: win-${{ github.head_ref }}
group: win-${{ github.ref }}
cancel-in-progress: true

jobs:
Expand Down
2 changes: 1 addition & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildscript {

allprojects {
group = "hu.bme.mit.theta"
version = "6.6.2"
version = "6.6.3"

apply(from = rootDir.resolve("gradle/shared-with-buildSrc/mirrors.gradle.kts"))
}
Expand Down

0 comments on commit 55c083c

Please sign in to comment.