Skip to content

Commit 8725438

Browse files
committed
remove dead code from old workflow
1 parent 05d0798 commit 8725438

File tree

1 file changed

+41
-135
lines changed

1 file changed

+41
-135
lines changed

.github/workflows/ci.yaml

Lines changed: 41 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -51,99 +51,6 @@ env:
5151
# text on stderr and so can break tests which check the output of a program).
5252

5353
jobs:
54-
test:
55-
runs-on: [self-hosted, Linux]
56-
container:
57-
image: lampepfl/dotty:2024-10-18
58-
options: --cpu-shares 4096
59-
volumes:
60-
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
61-
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
62-
- ${{ github.workspace }}/../../cache/general:/root/.cache
63-
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
64-
|| github.event_name == 'push'
65-
|| github.event_name == 'merge_group'
66-
|| (
67-
github.event_name == 'pull_request'
68-
&& !contains(github.event.pull_request.body, '[skip ci]')
69-
&& !contains(github.event.pull_request.body, '[skip test]')
70-
)
71-
|| (
72-
github.event_name == 'workflow_dispatch'
73-
&& github.repository == 'scala/scala3'
74-
)"
75-
76-
steps:
77-
- name: Set JDK 17 as default
78-
run: echo "/usr/lib/jvm/java-17-openjdk-amd64/bin" >> $GITHUB_PATH
79-
80-
- name: Reset existing repo
81-
run: |
82-
git config --global --add safe.directory $GITHUB_WORKSPACE
83-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
84-
85-
- name: Checkout cleanup script
86-
uses: actions/checkout@v5
87-
88-
- name: Cleanup
89-
run: .github/workflows/cleanup.sh
90-
91-
- name: Git Checkout
92-
uses: actions/checkout@v5
93-
94-
- name: Add SBT proxy repositories
95-
run: cp -vf .github/workflows/repositories /root/.sbt/ ; true
96-
97-
- name: Cmd Tests
98-
run: |
99-
./project/scripts/buildScalaBinary
100-
./project/scripts/sbt ";scala3-bootstrapped/compile ;scala3-bootstrapped/publishLocal ;scala3-compiler-bootstrapped/scala3CompilerCoursierTest:test"
101-
./project/scripts/cmdTests
102-
./project/scripts/bootstrappedOnlyCmdTests
103-
104-
test_windows_fast:
105-
runs-on: [self-hosted, Windows]
106-
if: "(
107-
github.event_name == 'push'
108-
&& github.ref != 'refs/heads/main'
109-
)
110-
|| github.event_name == 'merge_group'
111-
|| (
112-
github.event_name == 'pull_request'
113-
&& !contains(github.event.pull_request.body, '[skip ci]')
114-
&& !contains(github.event.pull_request.body, '[skip test_windows_fast]')
115-
)"
116-
117-
steps:
118-
- name: Reset existing repo
119-
shell: cmd
120-
run: |
121-
git config --global --add safe.directory $GITHUB_WORKSPACE
122-
git -c "http.https://github.com/.extraheader=" fetch --recurse-submodules=no "https://github.com/scala/scala3" && git reset --hard FETCH_HEAD || true
123-
124-
- name: Git Checkout
125-
uses: actions/checkout@v5
126-
127-
- name: Test
128-
run: sbt ";scala3-bootstrapped/compile"
129-
shell: cmd
130-
131-
#- name: build binary
132-
# run: sbt "dist-win-x86_64/Universal/stage" & bash -version
133-
# shell: cmd
134-
135-
- name: cygwin tests
136-
run: '"C:\Program Files\cygwin64\bin\bash" ./project/scripts/winCmdTests'
137-
shell: cmd
138-
139-
- name: msys tests
140-
run: '"C:\Program Files\Git\bin\bash" ./project/scripts/winCmdTests'
141-
shell: cmd
142-
143-
- name: win tests
144-
run: './project/scripts/winCmdTests.bat'
145-
shell: cmd
146-
14754
test_windows_full:
14855
runs-on: [self-hosted, Windows]
14956
if: "github.event_name == 'schedule' && github.repository == 'scala/scala3'
@@ -179,7 +86,6 @@ jobs:
17986
- ${{ github.workspace }}/../../cache/sbt:/root/.sbt
18087
- ${{ github.workspace }}/../../cache/ivy:/root/.ivy2/cache
18188
- ${{ github.workspace }}/../../cache/general:/root/.cache
182-
needs: [test, build-sdk-package, build-msi-package]
18389
if: "github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/')"
18490

18591
env:
@@ -297,44 +203,44 @@ jobs:
297203
- name: Publish Release
298204
run: ./project/scripts/sbtPublish ";project scala3-bootstrapped-new ;publishSigned ;sonaUpload"
299205

300-
build-msi-package:
301-
uses: ./.github/workflows/build-msi.yml
302-
if :
303-
(github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_msi]')) ||
304-
(github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/'))
305-
306-
test-msi-package:
307-
uses: ./.github/workflows/test-msi.yml
308-
needs: [build-msi-package]
309-
with:
310-
# Ensure that version starts with prefix 3.
311-
# In the future it can be adapted to compare with git tag or version set in the project/Build.scala
312-
version: "3."
313-
java-version: 17
314-
315-
build-sdk-package:
316-
uses: ./.github/workflows/build-sdk.yml
317-
if:
318-
(github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]')) ||
319-
(github.event_name == 'workflow_dispatch' && github.repository == 'scala/scala3') ||
320-
(github.event_name == 'schedule' && github.repository == 'scala/scala3') ||
321-
github.event_name == 'push' ||
322-
github.event_name == 'merge_group'
323-
with:
324-
java-version: 17
325-
326-
build-chocolatey-package:
327-
uses: ./.github/workflows/build-chocolatey.yml
328-
needs: [ build-sdk-package ]
329-
with:
330-
version: 3.6.0-SNAPSHOT # Fake version, used only for choco tests
331-
url : https://api.github.com/repos/scala/scala3/actions/artifacts/${{ needs.build-sdk-package.outputs.win-x86_64-id }}/zip
332-
digest : ${{ needs.build-sdk-package.outputs.win-x86_64-digest }}
333-
334-
test-chocolatey-package:
335-
uses: ./.github/workflows/test-chocolatey.yml
336-
with:
337-
version : 3.6.0-SNAPSHOT # Fake version, used only for choco tests
338-
java-version: 17
339-
if: github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_chocolatey]')
340-
needs: [ build-chocolatey-package ]
206+
#build-msi-package:
207+
# uses: ./.github/workflows/build-msi.yml
208+
# if :
209+
# (github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_msi]')) ||
210+
# (github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags/'))
211+
212+
#test-msi-package:
213+
# uses: ./.github/workflows/test-msi.yml
214+
# needs: [build-msi-package]
215+
# with:
216+
# # Ensure that version starts with prefix 3.
217+
# # In the future it can be adapted to compare with git tag or version set in the project/Build.scala
218+
# version: "3."
219+
# java-version: 17
220+
221+
#build-sdk-package:
222+
# uses: ./.github/workflows/build-sdk.yml
223+
# if:
224+
# (github.event_name == 'pull_request' && !contains(github.event.pull_request.body, '[skip ci]')) ||
225+
# (github.event_name == 'workflow_dispatch' && github.repository == 'scala/scala3') ||
226+
# (github.event_name == 'schedule' && github.repository == 'scala/scala3') ||
227+
# github.event_name == 'push' ||
228+
# github.event_name == 'merge_group'
229+
# with:
230+
# java-version: 17
231+
232+
#build-chocolatey-package:
233+
# uses: ./.github/workflows/build-chocolatey.yml
234+
# needs: [ build-sdk-package ]
235+
# with:
236+
# version: 3.6.0-SNAPSHOT # Fake version, used only for choco tests
237+
# url : https://api.github.com/repos/scala/scala3/actions/artifacts/${{ needs.build-sdk-package.outputs.win-x86_64-id }}/zip
238+
# digest : ${{ needs.build-sdk-package.outputs.win-x86_64-digest }}
239+
240+
#test-chocolatey-package:
241+
# uses: ./.github/workflows/test-chocolatey.yml
242+
# with:
243+
# version : 3.6.0-SNAPSHOT # Fake version, used only for choco tests
244+
# java-version: 17
245+
# if: github.event_name == 'pull_request' && contains(github.event.pull_request.body, '[test_chocolatey]')
246+
# needs: [ build-chocolatey-package ]

0 commit comments

Comments
 (0)