Skip to content

Commit

Permalink
Stealing bmarwell's improvements
Browse files Browse the repository at this point in the history
  • Loading branch information
@keeganwitt
keeganwitt committed Sep 25, 2023
1 parent 58721d2 commit 981d4e7
Showing 1 changed file with 21 additions and 11 deletions.
32 changes: 21 additions & 11 deletions .github/workflows/ci.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@ on:
branches:
- master

env:
MAVEN_OPTS: '-Xms2048m -Xmx2048m'
MAVEN_ARGS: >-
--show-version
--errors
--batch-mode
--no-transfer-progress
-Dinvoker.streamLogsOnFailures=true
-Pnonindy
defaults:
run:
shell: 'bash -o errexit -o nounset -o pipefail {0}'
Expand All @@ -17,25 +27,25 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
version:
groovy-version:
- 2.5.23
- 3.0.19
- 4.0.15
# - 5.0.0-alpha-2
env:
MVN_GROOVY_GROUP_ID: ${{format('{0}{1}', '-DgroovyVersion=', matrix.groovy-version)}}
MVN_GROOVY_VERSION: ${{(startsWith(matrix.groovy-version, '2') || startsWith(matrix.groovy-version, '3')) && '-DgroovyGroupId=org.codehaus.groovy' || '-DgroovyGroupId=org.apache.groovy' }}
steps:
- name: checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: jdk setup
uses: actions/setup-java@v3
with:
distribution: temurin
java-version: 11
java-package: jdk
architecture: x64
- name: unit and integration tests
env:
version: ${{ matrix.version }}
run: |
majorVersion=$(echo "${version}" | grep --extended-regex --only-matching "^[0-9]+")
[ "${majorVersion}" -gt "3" ] && groupId="org.apache.groovy" || groupId="org.codehaus.groovy"
./mvnw --batch-mode -DgroovyVersion="${version}" -DgroovyGroupId="${groupId}" clean install invoker:install invoker:run
- name: full test
run: >-
./mvnw ${MAVEN_ARGS}
${MVN_GROOVY_GROUP_ID}
${MVN_GROOVY_VERSION}
clean install invoker:install invoker:run

2 comments on commit 981d4e7

@gnodet
Copy link

@gnodet gnodet commented on 981d4e7 Sep 26, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@keeganwitt FWIW, it's a really bad idea to steal someone's improvement. The way to do that is to keep the author as shown in https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors for example. This usually happens automatically if you cherry-pick or merge...

@keeganwitt
Copy link
Member Author

@keeganwitt keeganwitt commented on 981d4e7 Sep 26, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@keeganwitt FWIW, it's a really bad idea to steal someone's improvement. The way to do that is to keep the author as shown in https://docs.github.com/en/pull-requests/committing-changes-to-your-project/creating-and-editing-commits/creating-a-commit-with-multiple-authors for example. This usually happens automatically if you cherry-pick or merge...

You're right. I should have cherry-picked it over then made the edits I did on top of it. I got in a hurry and didn't think about it. I'd used the word "stealing" as a jovial way of giving credit and wasn't trying to imply I was trying to take someone's work without credit. But I now recognize my hasty choice must have felt exactly like that. I'll be more careful in the future.

Please sign in to comment.