Skip to content

Commit de876f8

Browse files
committed
test
1 parent f290102 commit de876f8

File tree

3 files changed

+22
-56
lines changed

3 files changed

+22
-56
lines changed

.github/workflows/CD.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
echo ::set-output name=version::$version
2929
npm install
3030
npm run build -- $version ${{ matrix.config.system }}
31+
env:
32+
TOKEN: ${{ secrets.TOKEN }}
3133
- name: Upload
3234
uses: softprops/action-gh-release@v1
3335
with:
@@ -60,6 +62,8 @@ jobs:
6062
echo ::set-output name=version::$version
6163
npm install
6264
npm run build -- $version darwin
65+
env:
66+
TOKEN: ${{ secrets.TOKEN }}
6367
- name: Upload
6468
uses: softprops/action-gh-release@v1
6569
with:
@@ -92,6 +96,8 @@ jobs:
9296
echo "::set-output name=version::$version"
9397
npm install
9498
npm run build -- $version win64
99+
env:
100+
TOKEN: ${{ secrets.TOKEN }}
95101
- name: Upload
96102
uses: softprops/action-gh-release@v1
97103
with:

.github/workflows/CI.yml

Lines changed: 14 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,84 +5,44 @@ on:
55
pull_request:
66

77
jobs:
8-
build-linux:
8+
build:
99
runs-on: ubuntu-18.04
10-
container: ${{ matrix.config.container }}
1110
strategy:
1211
matrix:
13-
config:
14-
- {container: "geodesolutions/ubuntu", system: ubuntu}
15-
- {container: "geodesolutions/centos", system: rhel}
12+
system: [ubuntu, darwin, win64]
13+
python: [3.6, 3.7, 3.8]
14+
exclude:
15+
- system: win64
16+
python: 3.8
17+
include:
18+
- system: rhel
19+
python: 2.7
1620

1721
steps:
1822
- uses: actions/checkout@v1
1923
- name: Cache node modules
2024
uses: actions/[email protected]
2125
with:
2226
path: node_modules
23-
key: node-${{ matrix.config.system }}-${{ hashFiles('package-lock.json') }}
27+
key: node-${{ matrix.system }}-${{ hashFiles('package-lock.json') }}
2428
- name: Compile
2529
run: |
2630
npm install
27-
npm run build -- version ${{ matrix.config.system }}
28-
- name: Notify slack
29-
if: failure() && github.ref == 'refs/heads/master'
30-
uses: 8398a7/action-slack@v2
31-
with:
32-
status: failure
31+
npm run build -- version ${{ matrix.python }}-${{ matrix.system }}
3332
env:
34-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
35-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
36-
37-
build-mac:
38-
runs-on: macos-latest
39-
40-
steps:
41-
- uses: actions/checkout@v1
42-
- name: Cache node modules
43-
uses: actions/[email protected]
44-
with:
45-
path: node_modules
46-
key: node-darwin-${{ hashFiles('package-lock.json') }}
47-
- name: Compile
48-
run: |
49-
npm install
50-
npm run build -- version darwin
33+
TOKEN: ${{ secrets.TOKEN }}
5134
- name: Notify slack
5235
if: failure() && github.ref == 'refs/heads/master'
5336
uses: 8398a7/action-slack@v2
5437
with:
5538
status: failure
5639
env:
5740
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
58-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
59-
60-
build-windows:
61-
runs-on: windows-2016
41+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
6242

63-
steps:
64-
- uses: actions/checkout@v1
65-
- name: Cache node modules
66-
uses: actions/[email protected]
67-
with:
68-
path: node_modules
69-
key: node-win64-${{ hashFiles('package-lock.json') }}
70-
- name: Compile
71-
run: |
72-
npm install
73-
npm run build -- version win64
74-
- name: Notify slack
75-
if: failure() && github.ref == 'refs/heads/master'
76-
uses: 8398a7/action-slack@v2
77-
with:
78-
status: failure
79-
env:
80-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
81-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
82-
8343
semantic-release:
8444
runs-on: ubuntu-18.04
85-
needs: [build-linux, build-mac, build-windows]
45+
needs: build
8646
steps:
8747
- uses: actions/checkout@v1
8848
- run: npx semantic-release

version.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
2-
"geode": "v1.1.7",
2+
"geode": "v1.2.1",
33
"modules": {
4-
"OpenGeode": "v1.0.9"
4+
"OpenGeode": "v1.1.1"
55
}
66

77
}

0 commit comments

Comments
 (0)