Skip to content

Commit

Permalink
Point to branch in forked workflows repo
Browse files Browse the repository at this point in the history
  • Loading branch information
award999 committed Nov 7, 2024
1 parent b9648e2 commit 6dc7960
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 303 deletions.
35 changes: 3 additions & 32 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:

tests:
name: Test
uses: ./.github/workflows/swift_package_test.yml
uses: award999/github-workflows/.github/workflows/swift_package_test.yml@dockerless-windows
with:
# Linux
linux_exclude_swift_versions: '[{"swift_version": "nightly-main"}]'
Expand All @@ -37,42 +37,13 @@ jobs:
/bin/bash -c "source $NVM_DIR/nvm.sh && nvm install $NODE_VERSION"
echo "$NODE_PATH" >> $GITHUB_PATH
linux_build_command: ./docker/test.sh
enable_linux_checks: false
enable_linux_checks: true
# Windows
enable_windows_checks: true
enable_windows_docker: false
windows_exclude_swift_versions: '[{"swift_version": "nightly-main"}]'
windows_exclude_swift_versions: '[{"swift_version": "nightly"}]'
windows_env_vars: |
CI=1
FAST_TEST_RUN=1
windows_pre_build_command: .github\workflows\scripts\windows\install-nodejs.ps1
windows_build_command: docker\test-windows.ps1

tests-windows:
defaults:
run:
shell: powershell
name: Windows (${{ matrix.swift_version }})
runs-on: ${{ contains(matrix.swift_version, 'nightly') && 'windows-2019' || 'windows-2022' }}
strategy:
fail-fast: false
matrix:
swift_version: ['5.9', '5.10', '6.0', 'nightly', 'nightly-6.0']
steps:
- name: Checkout repository
uses: actions/checkout@v4
- name: Install node.js
if: ${{ !vars.skip_nodejs_install }}
run: . .github\workflows\scripts\windows\install-nodejs.ps1
- name: Install Visual Studio Build Tools
if: ${{ !vars.skip_vsb_install }}
run: . .github\workflows\scripts\windows\install-vsb.ps1
- name: Install Swift
if: ${{ !vars.skip_swift_install }}
run: . .github\workflows\scripts\windows\swift\install-swift-${{ matrix.swift_version }}.ps1
- name: Build / Test
run: |
cd $env:GITHUB_WORKSPACE
Import-Module $env:ChocolateyInstall\helpers\chocolateyProfile.psm1
refreshenv
docker\test-windows.ps1
24 changes: 0 additions & 24 deletions .github/workflows/scripts/windows/install-nodejs.ps1

This file was deleted.

32 changes: 0 additions & 32 deletions .github/workflows/scripts/windows/install-vsb.ps1

This file was deleted.

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/scripts/windows/swift/install-swift-5.9.ps1

This file was deleted.

6 changes: 0 additions & 6 deletions .github/workflows/scripts/windows/swift/install-swift-6.0.ps1

This file was deleted.

This file was deleted.

31 changes: 0 additions & 31 deletions .github/workflows/scripts/windows/swift/install-swift.ps1

This file was deleted.

159 changes: 0 additions & 159 deletions .github/workflows/swift_package_test.yml

This file was deleted.

0 comments on commit 6dc7960

Please sign in to comment.