diff options
| author | ruki <[email protected]> | 2020-09-12 21:37:25 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-09-12 21:37:25 +0800 |
| commit | 366e7fcdcb21c1e1dc53c8d52176289be93e34b9 (patch) | |
| tree | c1975b8696d44a904f6b9b1127b629f1b24cbc70 | |
| parent | 6d4e9bcb6bb5b7287fd90c86181e34371d3f18e2 (diff) | |
add msys2/mingw workflow
| -rw-r--r-- | .github/workflows/msys2_mingw.yml | 39 | ||||
| -rw-r--r-- | core/makefile | 2 | ||||
| -rw-r--r-- | makefile | 2 |
3 files changed, 41 insertions, 2 deletions
diff --git a/.github/workflows/msys2_mingw.yml b/.github/workflows/msys2_mingw.yml new file mode 100644 index 000000000..d2c99045d --- /dev/null +++ b/.github/workflows/msys2_mingw.yml @@ -0,0 +1,39 @@ +name: MSYS2 (MingW) + +on: + push: + pull_request: + +jobs: + build: + runs-on: windows-latest + strategy: + fail-fast: false + matrix: + include: [ + { msystem: MINGW64, arch: x86_64 }, + { msystem: MINGW32, arch: i686 } + ] + steps: + + - uses: actions/checkout@v2 + with: + path: temp + fetch-depth: 0 + + - uses: msys2/setup-msys2@v2 + with: + msystem: ${{ matrix.msystem }} + install: git base-devel mingw-w64-${{ matrix.arch }}-toolchain + update: true + + - name: Move Checkout + run: | + Copy-Item -Path ".\temp" -Destination "C:\_" -Recurse + - name: Build + shell: msys2 {0} + run: | + cd /C/_ + make build + source .\scripts\srcenv.profile + xmake lua -v -D tests/run.lua diff --git a/core/makefile b/core/makefile index f8d8eb39c..591f63510 100644 --- a/core/makefile +++ b/core/makefile @@ -187,7 +187,7 @@ endif ARCH := $(if $(findstring aarch64,$(ARCH)),arm64,$(ARCH)) ARCH := $(if $(findstring arm64,$(ARCH)),arm64,$(ARCH)) ARCH := $(if $(findstring arm,$(ARCH)),arm,$(ARCH)) -ARCH := $(if $(findstring i686,$(ARCH)),i386,$(ARCH)) +ARCH := $(if $(findstring i686,$(ARCH)),i386,$(ARCH)) # debug DEBUG :=$(if $(DEBUG),$(DEBUG),n) @@ -61,7 +61,7 @@ endif ARCH := $(if $(findstring aarch64,$(ARCH)),arm64,$(ARCH)) ARCH := $(if $(findstring arm64,$(ARCH)),arm64,$(ARCH)) ARCH := $(if $(findstring arm,$(ARCH)),arm,$(ARCH)) -ARCH := $(if $(findstring i686,$(ARCH)),i386,$(ARCH)) +ARCH := $(if $(findstring i686,$(ARCH)),i386,$(ARCH)) # conditionally map ARCH from amd64 to x86_64 if set from the outside # |