Skip to content

Commit 0643d95

Browse files
committed
pkg and release actions fix for windows build
1 parent 9d57487 commit 0643d95

File tree

1 file changed

+52
-69
lines changed

1 file changed

+52
-69
lines changed

.github/workflows/package-release.yml

Lines changed: 52 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ on:
44
push:
55
tags:
66
- 'v*'
7-
workflow_dispatch:
87

9-
jobs:
8+
jobs:
109
ubuntu:
11-
runs-on: ubuntu-latest
10+
runs-on: ubuntu-latest
1211
strategy:
1312
matrix:
1413
include:
@@ -18,21 +17,20 @@ jobs:
1817
variant_tag: ""
1918
steps:
2019
- uses: actions/checkout@v2
21-
- name: Set up Python
20+
- name: Set up Python
2221
uses: actions/setup-python@v2
2322
with:
2423
python-version: '3.6'
2524
- name: Get version tag
2625
id: get_version
2726
uses: battila7/get-version-action@v2
2827
- name: Ubuntu-Install dependencies
29-
run: |
28+
run: |
3029
sudo apt-get update
3130
sudo apt-get install -y software-properties-common
3231
sudo apt-get install -y build-essential
3332
sudo apt-get install -y python3-dev python3-pip python3-virtualenv
3433
sudo apt-get install -y pkg-config libssl-dev libdbus-1-dev libdbus-glib-1-dev python-dbus libffi-dev libkrb5-dev
35-
3634
- run: |
3735
pip install external/okta-0.0.3.1-py2.py3-none-any.whl
3836
pip install -e .
@@ -48,7 +46,7 @@ jobs:
4846
run: |
4947
cd dist
5048
tar czf "user-sync-$UST_VERSION $UST_VARIANT_TAG-ubuntu.tar.gz" user-sync
51-
env:
49+
env:
5250
UST_VARIANT_TAG: ${{matrix.variant_tag}}
5351
UST_VERSION: ${{ steps.get_version.outputs.version }}
5452
- name: Make artifacts
@@ -57,7 +55,8 @@ jobs:
5755
name: user-sync-artifact
5856
path: dist/*.tar.gz
5957
retention-days: 5
60-
58+
59+
6160
windows:
6261
runs-on: windows-latest
6362
strategy:
@@ -67,43 +66,36 @@ jobs:
6766
variant_tag: "-noext"
6867
- extension_support: 1
6968
variant_tag: ""
70-
steps:
69+
steps:
7170
- uses: actions/checkout@v2
7271
- uses: actions/setup-python@v2
7372
with:
7473
python-version: '3.6'
74+
- name: Get version tag
75+
id: get_version
76+
uses: battila7/get-version-action@v2
7577
- run: |
7678
pip install external/okta-0.0.3.1-py2.py3-none-any.whl
7779
pip install -e .
7880
pip install -e .[test]
7981
pip install -e .[setup]
80-
- name: Make Standalone
81-
run: |
82-
make standalone
82+
- run: make standalone
8383
env:
8484
UST_EXTENSION: ${{matrix.extension_support}}
8585
- name: Test with pytest
8686
run: pytest
87-
- name: Get version tag
88-
id: get_version
89-
uses: battila7/get-version-action@v2
90-
- name: zip
87+
- name: Get build
9188
run: |
9289
cd dist
93-
7za a user-sync-${UST_VERSION}${UST_VARIANT_TAG}-win64.zip user-sync.exe
94-
env:
95-
UST_VARIANT_TAG: ${{matrix.variant_tag}}
96-
UST_VERSION: ${{ steps.get_version.outputs.version }}
90+
7z a user-sync-${{ steps.get_version.outputs.version }}${{matrix.variant_tag}}-win64.zip user-sync.exe
9791
- name: Make artifact
98-
env:
99-
UST_VARIANT_TAG: ${{matrix.variant_tag}}
100-
UST_VERSION: ${{ steps.get_version.outputs.version }}
10192
uses: actions/upload-artifact@v2
10293
with:
10394
name: user-sync-artifact
10495
path: dist/*.zip
10596
retention-days: 5
106-
97+
98+
10799
centos:
108100
runs-on: ubuntu-latest
109101
env:
@@ -120,6 +112,9 @@ jobs:
120112
variant_tag: ""
121113
steps:
122114
- uses: actions/checkout@v2
115+
- name: Get version tag
116+
id: get_version
117+
uses: battila7/get-version-action@v2
123118
- name: Centos-Install dependencies
124119
run: |
125120
yum install -y epel-release
@@ -140,24 +135,20 @@ jobs:
140135
UST_EXTENSION: ${{matrix.extension_support}}
141136
- name: Test with pytest
142137
run: pytest -s
143-
- name: Get version tag
144-
id: get_version
145-
uses: battila7/get-version-action@v2
146138
- name: Get build
147139
run: |
148140
cd dist
149141
tar czf "user-sync-${UST_VERSION}${UST_VARIANT_TAG}-centos.tar.gz" user-sync
150142
env:
151143
UST_VARIANT_TAG: ${{matrix.variant_tag}}
152144
UST_VERSION: ${{ steps.get_version.outputs.version }}
153-
- name: make atrifact
145+
- name: Make artifact
154146
uses: actions/upload-artifact@v2
155147
with:
156148
name: user-sync-artifact
157149
path: dist/*.tar.gz
158150
retention-days: 5
159-
160-
151+
161152

162153
examples:
163154
runs-on: ubuntu-latest
@@ -181,42 +172,34 @@ jobs:
181172
path: user-sync-examples.tar.gz
182173
retention-days: 5
183174

184-
release:
185-
runs-on: ubuntu-latest
186-
needs: [ubuntu,windows, centos, examples]
187-
steps:
188-
- uses: actions/checkout@v2
189-
- name: Create Release
190-
id: create_release
191-
uses: actions/create-release@v1
192-
env:
193-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
194-
with:
195-
tag_name: ${{ github.ref }}
196-
release_name: user-sync ${{ github.ref }}
197-
body_path: .changelog/latest.md
198-
draft: true
199-
prerelease: false
200-
201-
upload-assets:
202-
needs: release
203-
runs-on: ubuntu-latest
204-
steps:
205-
- uses: actions/download-artifact@v2
206-
- name: Get version tag
207-
id: get_version
208-
uses: battila7/get-version-action@v2
209-
- run: ls -R
210-
- uses: fnkr/github-action-ghr@v1
211-
if: startsWith(github.ref, 'refs/tags/')
212-
env:
213-
GHR_PATH: user-sync-artifact/
214-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
215-
216-
217-
218-
219-
220-
221-
222-
175+
# release:
176+
# runs-on: ubuntu-latest
177+
# needs: [ubuntu,windows, centos, examples]
178+
# steps:
179+
# - uses: actions/checkout@v2
180+
# - name: Create Release
181+
# id: create_release
182+
# uses: actions/create-release@v1
183+
# env:
184+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
185+
# with:
186+
# tag_name: ${{ github.ref }}
187+
# release_name: user-sync ${{ github.ref }}
188+
# body_path: .changelog/latest.md
189+
# draft: true
190+
# prerelease: false
191+
#
192+
# upload-assets:
193+
# needs: release
194+
# runs-on: ubuntu-latest
195+
# steps:
196+
# - uses: actions/download-artifact@v2
197+
# - name: Get version tag
198+
# id: get_version
199+
# uses: battila7/get-version-action@v2
200+
# - run: ls -R
201+
# - uses: fnkr/github-action-ghr@v1
202+
# if: startsWith(github.ref, 'refs/tags/')
203+
# env:
204+
# GHR_PATH: user-sync-artifact/
205+
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

0 commit comments

Comments
 (0)