Skip to content

Commit bbc91a4

Browse files
committed
Merge branch '1.7.x' into fport/1.7.x
2 parents 2d00c69 + 1f29c90 commit bbc91a4

File tree

45 files changed

+212
-370
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+212
-370
lines changed

.appveyor.yml

-162
This file was deleted.

.github/workflows/ci.yml

+10-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
java: 8
4242
distribution: adopt
4343
jobtype: 8
44-
- os: windows-latest
44+
- os: windows-2019
4545
java: 8
4646
distribution: adopt
4747
jobtype: 9
@@ -95,6 +95,9 @@ jobs:
9595
with:
9696
path: ~/.sbt
9797
key: ${{ runner.os }}-sbt-cache-${{ hashFiles('**/*.sbt') }}-${{ hashFiles('project/build.properties') }}
98+
- name: Setup Windows C++ toolchain
99+
uses: ilammy/msvc-dev-cmd@v1
100+
if: ${{ matrix.os == 'windows-2019' }}
98101
- name: Build and test (1)
99102
if: ${{ matrix.jobtype == 1 }}
100103
shell: bash
@@ -107,7 +110,6 @@ jobs:
107110
./sbt -v --client serverTestProj/scalafmtCheckAll
108111
./sbt -v --client headerCheck
109112
./sbt -v --client "Test/headerCheck"
110-
./sbt -v --client whitesourceOnPush
111113
./sbt -v --client "Test/compile"
112114
./sbt -v --client publishLocal
113115
./sbt -v --client test
@@ -152,6 +154,8 @@ jobs:
152154
if: ${{ matrix.jobtype == 7 }}
153155
shell: bash
154156
run: |
157+
# test building sbtn on Linux
158+
sbt "-Dsbt.io.virtual=false" nativeImage
155159
# test launcher script
156160
echo build using JDK 8 test using JDK 8 and JDK 11
157161
cd launcher-package
@@ -165,6 +169,8 @@ jobs:
165169
if: ${{ matrix.jobtype == 8 }}
166170
shell: bash
167171
run: |
172+
# test building sbtn on macOS
173+
sbt "-Dsbt.io.virtual=false" nativeImage
168174
# test launcher script
169175
echo build using JDK 8, test using JDK 8, on macOS
170176
cd launcher-package
@@ -175,6 +181,8 @@ jobs:
175181
if: ${{ matrix.jobtype == 9 }}
176182
shell: bash
177183
run: |
184+
# test building sbtn on Windows
185+
sbt "-Dsbt.io.virtual=false" nativeImage
178186
# test launcher script
179187
echo build using JDK 8, test using JDK 8, on Windows
180188
cd launcher-package
+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
# .github/workflows/dependency-graph.yml
2+
name: Submit Dependency Graph
3+
on:
4+
push:
5+
branches: [1.7.x] # default branch of the project
6+
jobs:
7+
submit-graph:
8+
name: Submit Dependency Graph
9+
runs-on: ubuntu-latest # or windows-latest, or macOS-latest
10+
steps:
11+
- uses: actions/checkout@v3
12+
- uses: scalacenter/sbt-dependency-submission@v2

.github/workflows/nightly.yml

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
name: Nightly
22
on:
3-
schedule:
4-
# 08:00 UTC = 03:00 EST
5-
- cron: '0 8 * * *'
3+
workflow_dispatch:
4+
# schedule:
5+
# # 08:00 UTC = 03:00 EST
6+
# - cron: '0 8 * * *'
67

78
jobs:
89
deploy:

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[![CI](https://github.com/sbt/sbt/actions/workflows/ci.yml/badge.svg)](https://github.com/sbt/sbt/actions/workflows/ci.yml)
22
[![Latest version](https://img.shields.io/github/tag/sbt/sbt.svg)](https://index.scala-lang.org/sbt/sbt)
3-
[![Gitter Chat](https://badges.gitter.im/sbt/sbt.svg)](https://gitter.im/sbt/sbt)
3+
[![Discord](https://img.shields.io/discord/632150470000902164?label=Discord%20%23sbt)](https://discord.com/channels/632150470000902164/922600050989875282)
44

55
[sbt/sbt-zero-seven]: https://github.com/sbt/sbt-zero-seven
66
[CONTRIBUTING]: CONTRIBUTING.md

0 commit comments

Comments
 (0)