Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge 2.12 to 2.13 20250106 [ci:last-only] #10974

Merged
merged 9 commits into from
Jan 6, 2025
Merged

merge 2.12 to 2.13 20250106 [ci:last-only] #10974

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e9075e1
do not build the spec during PR validation
SethTisue Dec 19, 2024
9761bae
no more Travis-CI for PR validation, use GitHub Actions
SethTisue Dec 19, 2024
b045381
Merge pull request #10961 from SethTisue/get-travis-ci-out-of-pr-vali…
SethTisue Dec 20, 2024
07d1ed2
Update sbt, scripted-plugin to 1.10.7 in 2.12.x
scala-steward Dec 25, 2024
e8ee7aa
Merge pull request #10969 from scala-steward/update/2.12.x/sbt-1.10.7
SethTisue Dec 28, 2024
786f44a
bump copyright year to 2025
SethTisue Jan 6, 2025
393c05f
Merge pull request #10973 from SethTisue/copyright-2025
SethTisue Jan 6, 2025
b8a0aeb
Merge commit 'b045381055674f3b5bb32b76cb5188116e8356f5' into merge-2.…
SethTisue Jan 6, 2025
63cf7c4
Merge remote-tracking branch 'origin/2.12.x' into merge-2.12-to-2.13-…
SethTisue Jan 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
no more Travis-CI for PR validation, use GitHub Actions
  • Loading branch information
@SethTisue
SethTisue committed Dec 19, 2024
commit 9761bae976cbb47ca1a19a37412479ddb2a104fd
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml → .github/workflows/merge.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,4 @@ jobs:
- name: Test
run: |
STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
sbt -Dstarr.version=$STARR setupValidateTest test:compile info testAll
sbt -Dstarr.version=$STARR setupValidateTest Test/compile info testAll
30 changes: 30 additions & 0 deletions .github/workflows/validate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
name: PR validation
on:
pull_request:

jobs:
validate:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Setup Java
uses: actions/setup-java@v4
with:
distribution: temurin
java-version: 8
cache: sbt
- name: Setup SBT
uses: sbt/setup-sbt@v1
# "mini" bootstrap for PR validation
# "mini" in these senses:
# - it doesn't use the complicated legacy scripts.
# - it doesn't publish to scala-pr-validation-snapshots
# (because we need secrets for that and PRs from forks can't have secrets)
# it is still a true bootstrap.
- name: Stage 1
run: sbt -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
- name: Stage 2
run: |
STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
sbt -Dstarr.version=$STARR -warn setupValidateTest Test/compile info testAll
14 changes: 0 additions & 14 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,20 +30,6 @@ jobs:
- buildQuick
- triggerScalaDist

# pull request validation (w/ mini-bootstrap)
# "mini" in these senses:
# - it doesn't use the complicated legacy scripts.
# - it doesn't publish to scala-pr-validation-snapshots
# (because we need secrets for that and Travis-CI doesn't give PR jobs access to secrets)
# it is still a true bootstrap.
- stage: build
name: "JDK 8 pr validation"
if: type = pull_request
script:
- sbt -warn setupPublishCore generateBuildCharacterPropertiesFile headerCheck publishLocal
- STARR=`cat buildcharacter.properties | grep ^maven.version.number | cut -d= -f2` && echo $STARR
- sbt -Dstarr.version=$STARR -warn setupValidateTest test:compile info testAll

# build the spec using jekyll
- stage: build
if: type != pull_request
Expand Down
Loading