Skip to content

Commit 327fdeb

Browse files
Give GitHub's own Windows runner another try
Now that we don't depend on metabrowse, it might be fine again on the default runners…
1 parent deeda71 commit 327fdeb

File tree

1 file changed

+1
-19
lines changed

1 file changed

+1
-19
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,6 @@ on:
99
workflow_dispatch:
1010

1111
jobs:
12-
trigger-vm:
13-
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'VirtuslabRnD/scala-cli'
14-
runs-on: ubuntu-latest
15-
steps:
16-
- uses: azure/login@v1
17-
with:
18-
creds: '{"clientId": "42e79051-affb-4895-b54a-56a90bc4d86b", "clientSecret": "${{ secrets.SCALA3_CLIENT_SECRET }}", "subscriptionId": "da0a842a-c933-47fd-a4db-2d1a06fbafee","tenantId": "d09acba4-fb14-464d-851a-44a7cf8a064d","activeDirectoryEndpointUrl": "https://login.microsoftonline.com", "resourceManagerEndpointUrl": "https://management.azure.com/","activeDirectoryGraphResourceId": "https://graph.windows.net/", "sqlManagementEndpointUrl": "https://management.core.windows.net:8443/", "galleryEndpointUrl": "https://gallery.azure.com/", "managementEndpointUrl": "https://management.core.windows.net/"}'
19-
- run: |
20-
az vm start -g gh-runners -n scala-3-cli
21-
2212
jvm-tests:
2313
runs-on: ${{ matrix.OS }}
2414
strategy:
@@ -55,14 +45,7 @@ jobs:
5545
strategy:
5646
fail-fast: false
5747
matrix:
58-
OS: [[ self-hosted, windows, scala-3-cli ]]
59-
needsVirtuslabRepo: ["${{ github.event_name == 'push' || github.event.pull_request.head.repo.full_name == 'VirtuslabRnD/scala-cli' }}"]
60-
include:
61-
- {OS: ubuntu-latest, needsVirtuslabRepo: false}
62-
- {OS: macos-latest, needsVirtuslabRepo: false}
63-
exclude:
64-
- OS: [ self-hosted, windows, scala-3-cli ]
65-
needsVirtuslabRepo: false
48+
OS: ["ubuntu-latest", "macos-latest", "windows-2016"]
6649
steps:
6750
- uses: actions/checkout@v2
6851
with:
@@ -86,7 +69,6 @@ jobs:
8669
if-no-files-found: error
8770
retention-days: 2
8871
- name: Native integration tests
89-
if: runner.os != 'Windows' || (github.event_name == 'push' && github.ref == 'refs/heads/master')
9072
run: ./mill -i nativeIntegrationTests
9173

9274
native-mostly-static-tests:

0 commit comments

Comments
 (0)