Skip to content

Commit 2d1c465

Browse files
committed
test
1 parent 6fcccf1 commit 2d1c465

File tree

2 files changed

+11
-21
lines changed

2 files changed

+11
-21
lines changed

.github/workflows/CD.yml

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ on:
66

77
jobs:
88
build-linux:
9-
runs-on: ubuntu-18.04
10-
container: "geodesolutions/centos"
9+
runs-on: ubuntu-latest
10+
container: "ghcr.io/geode-solutions/centos:master"
1111
strategy:
1212
matrix:
1313
config:
14-
- {python: "3.6", tag: "cp36-cp36m", dir: "3.6m"}
1514
- {python: "3.7", tag: "cp37-cp37m", dir: "3.7m"}
1615
- {python: "3.8", tag: "cp38-cp38", dir: "3.8"}
1716
- {python: "3.9", tag: "cp39-cp39", dir: "3.9"}
@@ -35,8 +34,7 @@ jobs:
3534
npm run electron:package
3635
env:
3736
PLATFORM: "linux"
38-
Python3_EXECUTABLE: /opt/python/${{ matrix.config.tag }}/bin/python${{ matrix.config.dir }}
39-
Python3_INCLUDE_DIR: /opt/python/${{ matrix.config.tag }}/include/python${{ matrix.config.dir }}
37+
PYTHON_PREFIX: /opt/python/${{ matrix.config.tag }}
4038
- name: Upload
4139
uses: softprops/action-gh-release@v1
4240
with:
@@ -53,11 +51,10 @@ jobs:
5351
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
5452

5553
build-windows:
56-
runs-on: windows-2016
54+
runs-on: windows-2019
5755
strategy:
5856
matrix:
5957
config:
60-
- {python: "3.6", tag: "cp36-cp36m"}
6158
- {python: "3.7", tag: "cp37-cp37m"}
6259
- {python: "3.8", tag: "cp38-cp38"}
6360
- {python: "3.9", tag: "cp39-cp39"}
@@ -85,9 +82,7 @@ jobs:
8582
npm run electron:package
8683
env:
8784
PLATFORM: "win64"
88-
Python3_ROOT_DIR: ${{ env.pythonLocation }}
89-
CSC_LINK: ${{ secrets.CODE_SIGN_CERTIFICATE }}
90-
CSC_KEY_PASSWORD: ${{ secrets.CODE_SIGN_PASSWORD }}
85+
PYTHON_PREFIX: ${{ env.pythonLocation }}
9186
- name: Upload
9287
uses: softprops/action-gh-release@v1
9388
with:

.github/workflows/CI.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ on:
66

77
jobs:
88
build-linux:
9-
runs-on: ubuntu-18.04
10-
container: "geodesolutions/centos"
9+
runs-on: ubuntu-latest
10+
container: "ghcr.io/geode-solutions/centos:master"
1111
strategy:
1212
matrix:
1313
config:
14-
- {python: "3.6", tag: "cp36-cp36m", dir: "3.6m"}
1514
- {python: "3.7", tag: "cp37-cp37m", dir: "3.7m"}
1615
- {python: "3.8", tag: "cp38-cp38", dir: "3.8"}
1716
- {python: "3.9", tag: "cp39-cp39", dir: "3.9"}
@@ -32,8 +31,7 @@ jobs:
3231
env:
3332
VERSION: "unknown"
3433
PLATFORM: "linux"
35-
Python3_EXECUTABLE: /opt/python/${{ matrix.config.tag }}/bin/python${{ matrix.config.dir }}
36-
Python3_INCLUDE_DIR: /opt/python/${{ matrix.config.tag }}/include/python${{ matrix.config.dir }}
34+
PYTHON_PREFIX: /opt/python/${{ matrix.config.tag }}
3735
- name: Notify slack
3836
if: failure() && github.ref == 'refs/heads/master'
3937
uses: 8398a7/action-slack@v2
@@ -44,11 +42,10 @@ jobs:
4442
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
4543

4644
build-windows:
47-
runs-on: windows-2016
45+
runs-on: windows-2019
4846
strategy:
4947
matrix:
5048
config:
51-
- {python: "3.6", tag: "cp36-cp36m"}
5249
- {python: "3.7", tag: "cp37-cp37m"}
5350
- {python: "3.8", tag: "cp38-cp38"}
5451
- {python: "3.9", tag: "cp39-cp39"}
@@ -73,9 +70,7 @@ jobs:
7370
env:
7471
VERSION: "unknown"
7572
PLATFORM: "win64"
76-
Python3_ROOT_DIR: ${{ env.pythonLocation }}
77-
CSC_LINK: ${{ secrets.CODE_SIGN_CERTIFICATE }}
78-
CSC_KEY_PASSWORD: ${{ secrets.CODE_SIGN_PASSWORD }}
73+
PYTHON_PREFIX: ${{ env.pythonLocation }}
7974
- name: Notify slack
8075
if: failure() && github.ref == 'refs/heads/master'
8176
uses: 8398a7/action-slack@v2
@@ -86,7 +81,7 @@ jobs:
8681
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
8782

8883
semantic-release:
89-
runs-on: ubuntu-18.04
84+
runs-on: ubuntu-latest
9085
needs: [build-linux, build-windows]
9186
steps:
9287
- uses: actions/checkout@v1

0 commit comments

Comments
 (0)