summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-07-17 16:02:02 +0800
committerGitHub <[email protected]>2020-07-17 16:02:02 +0800
commitc3dd85b98492c012fc4eb1b46fac824051a1b92a (patch)
tree3b7cad9b739b2f010402715f5a4686c70f81ce59
parent50e403c5e3524327f0471cb1ec9cba148db747b1 (diff)
parentc3257e45039f4499192fa622ed9fd583e0dafc20 (diff)
Merge pull request #896 from OpportunityLiu/dev
fix build
-rw-r--r--.github/workflows/linux.yml11
-rw-r--r--.github/workflows/macos.yml11
-rw-r--r--.github/workflows/windows.yml9
3 files changed, 19 insertions, 12 deletions
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index cc058266b..0475978a1 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -4,7 +4,7 @@ on:
pull_request:
push:
release:
- types: published
+ types: [published]
jobs:
build:
@@ -12,10 +12,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
+ with:
+ submodules: true
+ - name: prepare local xmake
+ run: cp -rf . ../xmake-source
- uses: xmake-io/github-action-setup-xmake@v1
with:
- xmake-version: ${{ github.repository }}#sha@${{ github.sha }}
+ xmake-version: local#../xmake-source
- uses: mihails-strasuns/[email protected]
with:
compiler: dmd-latest
@@ -32,7 +36,6 @@ jobs:
run: |
sudo apt-get install -y ruby ruby-dev rubygems build-essential
sudo gem install --no-document fpm
- git submodule update --init
scripts/makepkg deb
# upload artifacts
- uses: actions/upload-artifact@v2
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 736844b0f..3d4b410f4 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -4,7 +4,7 @@ on:
pull_request:
push:
release:
- types: published
+ types: [published]
jobs:
build:
@@ -12,10 +12,14 @@ jobs:
runs-on: macos-latest
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
+ with:
+ submodules: true
+ - name: prepare local xmake
+ run: cp -rf . ../xmake-source
- uses: xmake-io/github-action-setup-xmake@v1
with:
- xmake-version: ${{ github.repository }}#sha@${{ github.sha }}
+ xmake-version: local#../xmake-source
- uses: mihails-strasuns/[email protected]
with:
compiler: dmd-latest
@@ -32,7 +36,6 @@ jobs:
run: |
brew install gnu-tar
gem install --no-document fpm
- git submodule update --init
scripts/makepkg osxpkg
scripts/archive-all
scripts/makeself/build-runfile.sh
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index 9cce0ae20..8741206d7 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -4,7 +4,7 @@ on:
pull_request:
push:
release:
- types: published
+ types: [published]
jobs:
build:
@@ -15,11 +15,13 @@ jobs:
runs-on: windows-latest
steps:
- - uses: actions/checkout@v1
+ - uses: actions/checkout@v2
+ with:
+ submodules: true
- uses: xmake-io/github-action-setup-xmake@v1
with:
# this is not supported, use dev branch instead
- # xmake-version: ${{ github.repository }}#sha@${{ github.sha }}
+ # xmake-version: local#
xmake-version: branch@dev
- uses: mihails-strasuns/[email protected]
with:
@@ -32,7 +34,6 @@ jobs:
run: |
# xmake
xmake show
- git submodule update --init
# nsis
Invoke-WebRequest "https://github.com/xmake-mirror/nsis/releases/download/v30b3/nsis-3.04.zip" -UseBasicParsing -OutFile ./nsis.zip
Invoke-WebRequest "https://github.com/xmake-mirror/nsis/releases/download/v30b3/nsis-3.04-strlen_8192.zip" -UseBasicParsing -OutFile ./nsis-longstr.zip