Skip to content

Commit 9faa514

Browse files
committed
fix(action): upload lock file and ignore it in windows env
1 parent ae842bf commit 9faa514

File tree

3 files changed

+64
-12
lines changed

3 files changed

+64
-12
lines changed

.github/workflows/nim-test-and-docs.yml

-4
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ jobs:
2121
with:
2222
nim-version: ${{ matrix.nim }}
2323
repo-token: ${{ secrets.GITHUB_TOKEN }}
24-
- name: setup and build
25-
run: |
26-
nimble install https://github.com/pysan3/nim_pandoc -y
27-
nimble setup -y
2824
- name: Run tests
2925
run: nimble test -y
3026
pretty:

.github/workflows/release-binaries.yml

+38-8
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ jobs:
5656
version: 1.0
5757
- name: setup and build
5858
run: |
59-
nimble install https://github.com/pysan3/nim_pandoc -y
6059
nimble setup -y
6160
nim musl -d:pcre -f:on nim_norg.nim
6261
- name: Compress Generated binaries
@@ -67,24 +66,54 @@ jobs:
6766
with:
6867
name: nim_norg-${{ matrix.target.name }}.tar.gz
6968
path: nim_norg-${{ matrix.target.name }}.tar.gz
70-
build:
69+
build-mac:
7170
strategy:
7271
fail-fast: false
7372
matrix:
7473
target:
7574
- os: macosx
7675
triple: x86_64-apple-darwin14
7776
name: apple_x64
77+
include:
78+
- target:
79+
os: macosx
80+
builder: macos-11
81+
defaults:
82+
run:
83+
shell: bash
84+
name: '${{ matrix.target.triple }}'
85+
runs-on: ${{ matrix.builder }}
86+
steps:
87+
- name: Checkout
88+
uses: actions/checkout@v3
89+
- uses: jiro4989/[email protected]
90+
with:
91+
nim-version: stable
92+
yes: true
93+
- name: setup and build
94+
run: |
95+
nimble setup -y
96+
nimble build -f:on -y
97+
- name: Compress Generated binaries
98+
run: |
99+
tar -c -z -v -f ./nim_norg-${{ matrix.target.name }}.tar.gz `ls nim_norg{,.exe} 2>/dev/null || true`
100+
- name: Upload Generated Binaries
101+
uses: actions/upload-artifact@v2
102+
with:
103+
name: nim_norg-${{ matrix.target.name }}.tar.gz
104+
path: nim_norg-${{ matrix.target.name }}.tar.gz
105+
build-win:
106+
strategy:
107+
fail-fast: false
108+
matrix:
109+
target:
78110
- os: windows
79111
triple: x86_64-w64-mingw32
80112
name: windows_x64
81113
- os: windows
82114
triple: i686-w64-mingw32
83115
name: windows_x32
84116
include:
85-
- target:
86-
os: macosx
87-
builder: macos-11
88117
- target:
89118
os: windows
90119
builder: windows-2019
@@ -102,8 +131,8 @@ jobs:
102131
yes: true
103132
- name: setup and build
104133
run: |
105-
nimble install https://github.com/pysan3/nim_pandoc -y
106-
nimble setup -y
134+
nimble install https://github.com/pysan3/nim_pandoc -y --noLockfile
135+
nimble setup -y --noLockfile
107136
nimble build -f:on -y
108137
- name: Compress Generated binaries
109138
run: |
@@ -117,7 +146,8 @@ jobs:
117146
name: Create Github Release
118147
needs:
119148
- build-musl
120-
- build
149+
- build-mac
150+
- build-win
121151
runs-on: ubuntu-latest
122152
permissions:
123153
contents: write

nimble.lock

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{
2+
"version": 2,
3+
"packages": {
4+
"nim_pandoc": {
5+
"version": "3.0.0",
6+
"vcsRevision": "599f88e3a98cde44a11615c4fccdd2919f2af80f",
7+
"url": "https://github.com/pysan3/nim_pandoc",
8+
"downloadMethod": "git",
9+
"dependencies": [],
10+
"checksums": {
11+
"sha1": "1f302a01ce3218f3542d44c9f4734bb2fa07e10b"
12+
}
13+
},
14+
"cligen": {
15+
"version": "1.6.15",
16+
"vcsRevision": "e607467c4e6a6c54f02b555135bce35eafa714c5",
17+
"url": "https://github.com/c-blake/cligen.git",
18+
"downloadMethod": "git",
19+
"dependencies": [],
20+
"checksums": {
21+
"sha1": "69330c86da69969dde7d23669e87503bbd17f459"
22+
}
23+
}
24+
},
25+
"tasks": {}
26+
}

0 commit comments

Comments
 (0)