Undo removing GCC from Windows workflows as it is still necessary for esbuild-rs

This commit is contained in:
Wilson Lin 2020-07-22 21:56:07 +10:00
parent 4e691ac550
commit 9c1a76a48b
5 changed files with 33 additions and 0 deletions

View File

@ -42,6 +42,9 @@ jobs:
toolchain: stable
profile: minimal
default: true
- name: Set up GCC (Windows)
if: runner.os == 'Windows'
run: .\.github\workflows\gcc.ps1
- name: Set up Go
uses: actions/setup-go@v2
with:

4
.github/workflows/gcc.ps1 vendored Normal file
View File

@ -0,0 +1,4 @@
Invoke-WebRequest 'https://wilsonl.in/TDM-GCC-64.7z' -OutFile C:\gcc.7z
7z x C:\gcc.7z -oC:\
$oldpath = (Get-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH).Path
Set-ItemProperty -Path 'Registry::HKEY_LOCAL_MACHINE\System\CurrentControlSet\Control\Session Manager\Environment' -Name PATH -Value "C:\TDM-GCC-64\bin;$oldpath"

View File

@ -25,22 +25,31 @@ jobs:
FILE: 'hyperbuild_java.dll'
steps:
- uses: actions/checkout@v1
- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
default: true
- name: Set up GCC (Windows)
if: runner.os == 'Windows'
run: .\.github\workflows\gcc.ps1
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '^1.14.0'
- name: Run prebuild steps
shell: bash
run: bash ./prebuild.sh
- name: Build Java native library
run: cargo build --release
working-directory: ./java
- name: Upload built library
uses: actions/upload-artifact@v1
with:

View File

@ -23,27 +23,37 @@ jobs:
ARCH: windows-x86_64
steps:
- uses: actions/checkout@v1
- name: Get version
id: version
shell: bash
run: echo ::set-output name=VERSION::"$([[ "$GITHUB_REF" == refs/tags/v* ]] && echo ${GITHUB_REF#refs/tags/v} || echo '0.0.0')"
- name: Set up Node.js
uses: actions/setup-node@master
with:
node-version: ${{ matrix.node }}.x
- name: Set up Rust
uses: actions-rs/toolchain@v1
with:
toolchain: stable
profile: minimal
default: true
- name: Set up GCC (Windows)
if: runner.os == 'Windows'
run: .\.github\workflows\gcc.ps1
- name: Set up Go
uses: actions/setup-go@v2
with:
go-version: '^1.14.0'
- name: Run prebuild steps
shell: bash
run: bash ./prebuild.sh
- name: Build native module
working-directory: ./nodejs
shell: bash
@ -51,15 +61,18 @@ jobs:
npm install
npm run build
node compress.js
- name: Install B2 CLI (macOS, Linux)
if: runner.os != 'Windows'
run: |
sudo pip install setuptools
sudo pip install --upgrade b2
- name: Install B2 CLI (Windows)
if: runner.os == 'Windows'
run: |
pip install --upgrade b2
- name: Upload to B2
shell: bash
run: |

View File

@ -29,6 +29,10 @@ jobs:
profile: minimal
default: true
- name: Set up GCC (Windows)
if: runner.os == 'Windows'
run: .\.github\workflows\gcc.ps1
- name: Set up Go
uses: actions/setup-go@v2
with: