Skip to content

Commit 548cd19

Browse files
anatoliykmetyukanatoliykmetyuk
committed
Disable publishing of already-published artefacts
Also disable the community build since it relies on complete local publish of all the artefacts.
1 parent dd58e84 commit 548cd19

File tree

2 files changed

+91
-87
lines changed

2 files changed

+91
-87
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 85 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -182,103 +182,103 @@ jobs:
182182
run: sbt ";sjsJUnitTests/test ;sjsCompilerTests/test"
183183
shell: cmd
184184

185-
community_build_a:
186-
runs-on: [self-hosted, Linux]
187-
container:
188-
image: lampepfl/dotty:2021-03-22
189-
options: --cpu-shares 4096
190-
volumes:
191-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
192-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
193-
- ${{ github.workspace }}/../../cache/general:/root/.cache
194-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
195-
|| github.event_name == 'push'
196-
|| (
197-
github.event_name == 'pull_request'
198-
&& !contains(github.event.pull_request.body, '[skip ci]')
199-
&& !contains(github.event.pull_request.body, '[skip community_build]')
200-
)
201-
|| (
202-
github.event_name == 'workflow_dispatch'
203-
&& github.repository == 'lampepfl/dotty'
204-
)"
185+
# community_build_a:
186+
# runs-on: [self-hosted, Linux]
187+
# container:
188+
# image: lampepfl/dotty:2021-03-22
189+
# options: --cpu-shares 4096
190+
# volumes:
191+
# - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
192+
# - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
193+
# - ${{ github.workspace }}/../../cache/general:/root/.cache
194+
# if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
195+
# || github.event_name == 'push'
196+
# || (
197+
# github.event_name == 'pull_request'
198+
# && !contains(github.event.pull_request.body, '[skip ci]')
199+
# && !contains(github.event.pull_request.body, '[skip community_build]')
200+
# )
201+
# || (
202+
# github.event_name == 'workflow_dispatch'
203+
# && github.repository == 'lampepfl/dotty'
204+
# )"
205205

206-
steps:
207-
- name: Reset existing repo
208-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
206+
# steps:
207+
# - name: Reset existing repo
208+
# run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
209209

210-
- name: Checkout cleanup script
211-
uses: actions/checkout@v2
210+
# - name: Checkout cleanup script
211+
# uses: actions/checkout@v2
212212

213-
- name: Cleanup
214-
run: .github/workflows/cleanup.sh
213+
# - name: Cleanup
214+
# run: .github/workflows/cleanup.sh
215215

216-
- name: Git Checkout
217-
uses: actions/checkout@v2
216+
# - name: Git Checkout
217+
# uses: actions/checkout@v2
218218

219-
- name: Add SBT proxy repositories
220-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
219+
# - name: Add SBT proxy repositories
220+
# run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
221221

222-
- name: Disable experimental features on release
223-
if: "github.event_name == 'push'
224-
&& startsWith(github.event.ref, 'refs/tags/')
225-
&& !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
226-
run: echo "DISALLOW_EXPERIMENTAL_FEATURES=true" >> $GITHUB_ENV
222+
# - name: Disable experimental features on release
223+
# if: "github.event_name == 'push'
224+
# && startsWith(github.event.ref, 'refs/tags/')
225+
# && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
226+
# run: echo "DISALLOW_EXPERIMENTAL_FEATURES=true" >> $GITHUB_ENV
227227

228-
- name: Test
229-
run: |
230-
git submodule sync
231-
git submodule update --init --recursive --jobs 7
232-
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
228+
# - name: Test
229+
# run: |
230+
# git submodule sync
231+
# git submodule update --init --recursive --jobs 7
232+
# ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestA"
233233

234-
community_build_b:
235-
runs-on: [self-hosted, Linux]
236-
container:
237-
image: lampepfl/dotty:2021-03-22
238-
options: --cpu-shares 4096
239-
volumes:
240-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
241-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
242-
- ${{ github.workspace }}/../../cache/general:/root/.cache
243-
if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
244-
|| github.event_name == 'push'
245-
|| (
246-
github.event_name == 'pull_request'
247-
&& !contains(github.event.pull_request.body, '[skip ci]')
248-
&& !contains(github.event.pull_request.body, '[skip community_build]')
249-
)
250-
|| (
251-
github.event_name == 'workflow_dispatch'
252-
&& github.repository == 'lampepfl/dotty'
253-
)"
234+
# community_build_b:
235+
# runs-on: [self-hosted, Linux]
236+
# container:
237+
# image: lampepfl/dotty:2021-03-22
238+
# options: --cpu-shares 4096
239+
# volumes:
240+
# - ${{ github.workspace }}/../../cache/sbt:/root/.sbt
241+
# - ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
242+
# - ${{ github.workspace }}/../../cache/general:/root/.cache
243+
# if: "github.event_name == 'schedule' && github.repository == 'lampepfl/dotty'
244+
# || github.event_name == 'push'
245+
# || (
246+
# github.event_name == 'pull_request'
247+
# && !contains(github.event.pull_request.body, '[skip ci]')
248+
# && !contains(github.event.pull_request.body, '[skip community_build]')
249+
# )
250+
# || (
251+
# github.event_name == 'workflow_dispatch'
252+
# && github.repository == 'lampepfl/dotty'
253+
# )"
254254

255-
steps:
256-
- name: Reset existing repo
257-
run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
255+
# steps:
256+
# - name: Reset existing repo
257+
# run: git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/lampepfl/dotty" && git reset --hard FETCH_HEAD || true
258258

259-
- name: Checkout cleanup script
260-
uses: actions/checkout@v2
259+
# - name: Checkout cleanup script
260+
# uses: actions/checkout@v2
261261

262-
- name: Cleanup
263-
run: .github/workflows/cleanup.sh
262+
# - name: Cleanup
263+
# run: .github/workflows/cleanup.sh
264264

265-
- name: Git Checkout
266-
uses: actions/checkout@v2
265+
# - name: Git Checkout
266+
# uses: actions/checkout@v2
267267

268-
- name: Add SBT proxy repositories
269-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
268+
# - name: Add SBT proxy repositories
269+
# run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
270270

271-
- name: Disable experimental features on release
272-
if: "github.event_name == 'push'
273-
&& startsWith(github.event.ref, 'refs/tags/')
274-
&& !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
275-
run: echo "DISALLOW_EXPERIMENTAL_FEATURES=true" >> $GITHUB_ENV
271+
# - name: Disable experimental features on release
272+
# if: "github.event_name == 'push'
273+
# && startsWith(github.event.ref, 'refs/tags/')
274+
# && !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
275+
# run: echo "DISALLOW_EXPERIMENTAL_FEATURES=true" >> $GITHUB_ENV
276276

277-
- name: Test
278-
run: |
279-
git submodule sync
280-
git submodule update --init --recursive --jobs 7
281-
./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
277+
# - name: Test
278+
# run: |
279+
# git submodule sync
280+
# git submodule update --init --recursive --jobs 7
281+
# ./project/scripts/sbt "community-build/testOnly dotty.communitybuild.CommunityBuildTestB"
282282

283283
# community_build_c:
284284
# runs-on: [self-hosted, Linux]
@@ -428,7 +428,7 @@ jobs:
428428
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
429429
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
430430
- ${{ github.workspace }}/../../cache/general:/root/.cache
431-
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, test_sbt, test_java8]
431+
needs: [test_non_bootstrapped, test, test_sbt, test_java8]
432432
if: "(github.event_name == 'schedule' || github.event_name == 'workflow_dispatch') && github.repository == 'lampepfl/dotty'"
433433
env:
434434
NIGHTLYBUILD: yes
@@ -511,7 +511,7 @@ jobs:
511511
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
512512
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
513513
- ${{ github.workspace }}/../../cache/general:/root/.cache
514-
needs: [test_non_bootstrapped, test, community_build_a, community_build_b, test_sbt, test_java8]
514+
needs: [test_non_bootstrapped, test, test_sbt, test_java8]
515515
if: "github.event_name == 'push'
516516
&& startsWith(github.event.ref, 'refs/tags/')
517517
&& !startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
@@ -645,7 +645,7 @@ jobs:
645645
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
646646
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
647647
- ${{ github.workspace }}/../../cache/general:/root/.cache
648-
needs: [community_build_a, community_build_b, test_sbt]
648+
needs: [test_sbt]
649649
if: "github.event_name == 'push'
650650
&& startsWith(github.event.ref, 'refs/tags/sbt-dotty-')"
651651

‎project/Build.scala‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,10 @@ object Build {
401401
lazy val `scala3-bootstrapped` = project.asDottyRoot(Bootstrapped)
402402

403403
lazy val `scala3-interfaces` = project.in(file("interfaces")).
404-
settings(commonJavaSettings)
404+
settings(commonJavaSettings).
405+
settings(
406+
publish / skip := true
407+
)
405408

406409
/** Find an artifact with the given `name` in `classpath` */
407410
def findArtifact(classpath: Def.Classpath, name: String): File = classpath
@@ -926,7 +929,8 @@ object Build {
926929
Test / test := (LocalProject("scala3-sbt-bridge-tests") / Test / test).value,
927930

928931
// The `newCompilerInterface` is backward compatible with the `oldCompilerInterface`
929-
libraryDependencies += Dependencies.newCompilerInterface % Provided
932+
libraryDependencies += Dependencies.newCompilerInterface % Provided,
933+
publish / skip := true
930934
)
931935

932936
// We use a separate project for the bridge tests since they can only be run

0 commit comments

Comments
 (0)