Skip to content

Commit e820b32

Browse files
matyalattematyalatte
authored
Merge pull request #10 from matyalatte/dev
v0.2.3 update
2 parents 57a15b8 + 863e019 commit e820b32

21 files changed

+339
-242
lines changed

‎.github/workflows/build_all.yml

+33-50
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@ on:
88

99
env:
1010
ZIP_NAME: SimpleCommandRunner
11-
CACHE_NAME: main
1211

1312
jobs:
1413
setup:
1514
runs-on: ubuntu-latest
1615
outputs:
17-
version: ${{ steps.check-tag.outputs.version }}
16+
tag: ${{ steps.check-tag.outputs.tag }}
1817
url: ${{ steps.create-release.outputs.upload_url }}
1918
wx_version: ${{ steps.wx-version.outputs.version }}
2019
steps:
@@ -23,11 +22,11 @@ jobs:
2322
id: check-tag
2423
run: |
2524
if [[ ${{ github.ref }} == refs/tags/v* ]]; then
26-
VERSION=-$(echo ${{ github.ref }} | sed -e "s#refs/tags/##g")
25+
TAG=$(echo ${{ github.ref }} | sed -e "s#refs/tags/##g")
2726
else
28-
VERSION=""
27+
TAG=$(echo ${{ github.sha }} | cut -c1-7)
2928
fi
30-
echo "::set-output name=version::$VERSION"
29+
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
3130
shell: bash
3231

3332
- uses: actions/checkout@v3
@@ -36,17 +35,15 @@ jobs:
3635
id: wx-version
3736
run: |
3837
VERSION=$(cat WX_VERSION.txt)
39-
echo "::set-output name=version::$VERSION"
38+
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
4039
shell: bash
41-
40+
4241
- name: Create Release Draft
4342
id: create-release
44-
uses: actions/create-release@v1
45-
env:
46-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
43+
uses: softprops/action-gh-release@v1
4744
with:
48-
tag_name: ${{ github.ref }}
49-
release_name: ${{ github.ref }}
45+
tag_name: ${{ steps.check-tag.outputs.tag }}
46+
name: ${{ steps.check-tag.outputs.tag }}
5047
body: |
5148
Changelog
5249
- First Change
@@ -61,11 +58,11 @@ jobs:
6158
- uses: actions/checkout@v3
6259

6360
- name: Cache wxWidget
64-
uses: actions/cache@v2
61+
uses: actions/cache@v3
6562
id: cache-wx
6663
with:
6764
path: "C:/wxWidgets-${{ needs.setup.outputs.wx_version }}"
68-
key: ${{ runner.os }}-wx${{ needs.setup.outputs.wx_version }}-${{ env.CACHE_NAME }}
65+
key: ${{ runner.os }}-wx${{ needs.setup.outputs.wx_version }}
6966

7067
- name: install wxWidget
7168
if: steps.cache-wx.outputs.cache-hit != 'true'
@@ -81,32 +78,25 @@ jobs:
8178
8279
- name: copy files
8380
run: |
84-
mkdir -p ../release
85-
cp Release/Release/SimpleCommandRunner.exe ../release
86-
cp examples/4_help/gui_definition.json ../release
87-
cp changelog.txt ../release
88-
cp license.txt ../release
81+
mkdir -p archive
82+
cp Release/Release/SimpleCommandRunner.exe archive
83+
cp examples/4_help/gui_definition.json archive
84+
cp changelog.txt archive
85+
cp license.txt archive
8986
shell: bash
9087

9188
- name: Archive Release
9289
uses: thedoctor0/zip-release@master
9390
with:
94-
directory: '../release'
91+
directory: 'archive'
9592
type: 'zip'
96-
filename: '${{ env.ZIP_NAME }}.zip'
97-
exclusions: '*.git* .gitignore'
98-
99-
- name: Upload Release Asset for windows
100-
id: upload-release-asset-windows
101-
uses: actions/upload-release-asset@v1
93+
filename: '${{ env.ZIP_NAME }}_${{ needs.setup.outputs.tag }}_${{ runner.os }}.zip'
94+
95+
- name: Upload Release Asset
10296
env:
10397
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
104-
with:
105-
upload_url: ${{ needs.setup.outputs.url }}
106-
asset_path: ../release/${{ env.ZIP_NAME }}.zip
107-
asset_name: ${{ env.ZIP_NAME }}${{ needs.setup.outputs.version }}-${{ runner.os }}.zip
108-
asset_content_type: application/zip
109-
98+
run: gh release upload ${{ needs.setup.outputs.tag }} archive/${{ env.ZIP_NAME }}_${{ needs.setup.outputs.tag }}_${{ runner.os }}.zip
99+
110100
build_unix:
111101
strategy:
112102
matrix:
@@ -117,11 +107,11 @@ jobs:
117107
- uses: actions/checkout@v3
118108

119109
- name: Cache wxWidget
120-
uses: actions/cache@v2
110+
uses: actions/cache@v3
121111
id: cache-wx
122112
with:
123113
path: "~/wxWidgets-${{ needs.setup.outputs.wx_version }}"
124-
key: ${{ runner.os }}-wx${{ needs.setup.outputs.wx_version }}-${{ env.CACHE_NAME }}
114+
key: ${{ runner.os }}-wx${{ needs.setup.outputs.wx_version }}
125115

126116
- name: install gtk
127117
if: runner.os=='Linux'
@@ -141,22 +131,15 @@ jobs:
141131
142132
- name: copy files
143133
run: |
144-
mkdir -p ../release/${{ env.ZIP_NAME }}
145-
cp Release/SimpleCommandRunner ../release/${{ env.ZIP_NAME }}
146-
cp examples/4_help/gui_definition.json ../release/${{ env.ZIP_NAME }}
147-
cp changelog.txt ../release/${{ env.ZIP_NAME }}
148-
cp license.txt ../release/${{ env.ZIP_NAME }}
149-
cd ../release
150-
tar -jcvf ${{ env.ZIP_NAME }}.tar.bz2 ${{ env.ZIP_NAME }}
134+
mkdir -p archive/${{ env.ZIP_NAME }}
135+
cp Release/SimpleCommandRunner archive/${{ env.ZIP_NAME }}
136+
cp examples/4_help/gui_definition.json archive/${{ env.ZIP_NAME }}
137+
cp changelog.txt archive/${{ env.ZIP_NAME }}
138+
cp license.txt archive/${{ env.ZIP_NAME }}
139+
cd archive
140+
tar -jcvf ${{ env.ZIP_NAME }}_${{ needs.setup.outputs.tag }}_${{ runner.os }}.tar.bz2 ${{ env.ZIP_NAME }}
151141
152-
- name: Upload Release Asset for ubuntu
153-
id: upload-release-asset-ubuntu
154-
uses: actions/upload-release-asset@v1
142+
- name: Upload Release Asset
155143
env:
156144
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
157-
with:
158-
upload_url: ${{ needs.setup.outputs.url }}
159-
asset_path: ../release/${{ env.ZIP_NAME }}.tar.bz2
160-
asset_name: ${{ env.ZIP_NAME }}${{ needs.setup.outputs.version }}-${{ runner.os }}.tar.bz2
161-
asset_content_type: application/zip
162-
145+
run: gh release upload ${{ needs.setup.outputs.tag }} archive/${{ env.ZIP_NAME }}_${{ needs.setup.outputs.tag }}_${{ runner.os }}.tar.bz2

‎.github/workflows/build_mac.yml

+30-28
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,38 @@ on:
55

66
env:
77
ZIP_NAME: SimpleCommandRunner
8-
CACHE_NAME: main
98

109
jobs:
1110
build:
1211
runs-on: macos-11
1312
steps:
14-
13+
14+
- name: Check tag
15+
id: check-tag
16+
run: |
17+
if [[ ${{ github.ref }} == refs/tags/v* ]]; then
18+
TAG=$(echo ${{ github.ref }} | sed -e "s#refs/tags/##g")
19+
else
20+
TAG=$(echo ${{ github.sha }} | cut -c1-7)
21+
fi
22+
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
23+
shell: bash
24+
1525
- uses: actions/checkout@v3
1626

1727
- name: Check wxWidget version
1828
id: wx-version
1929
run: |
2030
VERSION=$(cat WX_VERSION.txt)
21-
echo "::set-output name=version::$VERSION"
31+
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
2232
shell: bash
2333

2434
- name: Cache wxWidget
25-
uses: actions/cache@v2
35+
uses: actions/cache@v3
2636
id: cache-wx
2737
with:
2838
path: "~/wxWidgets-${{ steps.wx-version.outputs.version }}"
29-
key: ${{ runner.os }}-wx${{ steps.wx-version.outputs.version }}-${{ env.CACHE_NAME }}
39+
key: ${{ runner.os }}-wx${{ steps.wx-version.outputs.version }}
3040

3141
- name: build wxWidget
3242
if: steps.cache-wx.outputs.cache-hit != 'true'
@@ -41,36 +51,28 @@ jobs:
4151
4252
- name: copy files
4353
run: |
44-
mkdir -p ../release/${{ env.ZIP_NAME }}
45-
cp Release/SimpleCommandRunner ../release/${{ env.ZIP_NAME }}
46-
cp examples/4_help/gui_definition.json ../release/${{ env.ZIP_NAME }}
47-
cp changelog.txt ../release/${{ env.ZIP_NAME }}
48-
cp license.txt ../release/${{ env.ZIP_NAME }}
49-
cd ../release
50-
tar -jcvf ${{ env.ZIP_NAME }}.tar.bz2 ${{ env.ZIP_NAME }}
51-
54+
mkdir -p archive/${{ env.ZIP_NAME }}
55+
cp Release/SimpleCommandRunner archive/${{ env.ZIP_NAME }}
56+
cp examples/4_help/gui_definition.json archive/${{ env.ZIP_NAME }}
57+
cp changelog.txt archive/${{ env.ZIP_NAME }}
58+
cp license.txt archive/${{ env.ZIP_NAME }}
59+
cd archive
60+
tar -jcvf ${{ env.ZIP_NAME }}_${{ runner.os }}.tar.bz2 ${{ env.ZIP_NAME }}
61+
5262
- name: Create Release Draft
53-
id: create_release
54-
uses: actions/create-release@v1
55-
env:
56-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
63+
id: create-release
64+
uses: softprops/action-gh-release@v1
5765
with:
58-
tag_name: ${{ github.ref }}
59-
release_name: ${{ github.ref }}
66+
tag_name: ${{ steps.check-tag.outputs.tag }}
67+
name: ${{ steps.check-tag.outputs.tag }}
6068
body: |
6169
Changelog
6270
- First Change
6371
- Second Change
6472
draft: true
6573
prerelease: false
66-
67-
- name: Upload Release Asset for ubuntu
68-
id: upload-release-asset-ubuntu
69-
uses: actions/upload-release-asset@v1
74+
75+
- name: Upload Release Asset
7076
env:
7177
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
72-
with:
73-
upload_url: ${{ steps.create_release.outputs.upload_url }}
74-
asset_path: ../release/${{ env.ZIP_NAME }}.tar.bz2
75-
asset_name: ${{ env.ZIP_NAME }}-${{ runner.os }}.tar.bz2
76-
asset_content_type: application/zip
78+
run: gh release upload ${{ steps.check-tag.outputs.tag }} archive/${{ env.ZIP_NAME }}_${{ runner.os }}.tar.bz2

‎.github/workflows/build_ubuntu.yml

+29-27
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,38 @@ on:
55

66
env:
77
ZIP_NAME: SimpleCommandRunner
8-
CACHE_NAME: main
98

109
jobs:
1110
build:
1211
runs-on: ubuntu-20.04
1312
steps:
14-
13+
14+
- name: Check tag
15+
id: check-tag
16+
run: |
17+
if [[ ${{ github.ref }} == refs/tags/v* ]]; then
18+
TAG=$(echo ${{ github.ref }} | sed -e "s#refs/tags/##g")
19+
else
20+
TAG=$(echo ${{ github.sha }} | cut -c1-7)
21+
fi
22+
echo "tag=$TAG" >> "$GITHUB_OUTPUT"
23+
shell: bash
24+
1525
- uses: actions/checkout@v3
1626

1727
- name: Check wxWidget version
1828
id: wx-version
1929
run: |
2030
VERSION=$(cat WX_VERSION.txt)
21-
echo "::set-output name=version::$VERSION"
31+
echo "version=$VERSION" >> "$GITHUB_OUTPUT"
2232
shell: bash
2333

2434
- name: Cache wxWidget
25-
uses: actions/cache@v2
35+
uses: actions/cache@v3
2636
id: cache-wx
2737
with:
2838
path: "~/wxWidgets-${{ steps.wx-version.outputs.version }}"
29-
key: ${{ runner.os }}-wx${{ steps.wx-version.outputs.version }}-${{ env.CACHE_NAME }}
39+
key: ${{ runner.os }}-wx${{ steps.wx-version.outputs.version }}
3040

3141
- name: install gtk
3242
run: |
@@ -45,36 +55,28 @@ jobs:
4555
4656
- name: copy files
4757
run: |
48-
mkdir -p ../release/${{ env.ZIP_NAME }}
49-
cp Release/SimpleCommandRunner ../release/${{ env.ZIP_NAME }}
50-
cp examples/4_help/gui_definition.json ../release/${{ env.ZIP_NAME }}
51-
cp changelog.txt ../release/${{ env.ZIP_NAME }}
52-
cp license.txt ../release/${{ env.ZIP_NAME }}
53-
cd ../release
54-
tar -jcvf ${{ env.ZIP_NAME }}.tar.bz2 ${{ env.ZIP_NAME }}
58+
mkdir -p archive/${{ env.ZIP_NAME }}
59+
cp Release/SimpleCommandRunner archive/${{ env.ZIP_NAME }}
60+
cp examples/4_help/gui_definition.json archive/${{ env.ZIP_NAME }}
61+
cp changelog.txt archive/${{ env.ZIP_NAME }}
62+
cp license.txt archive/${{ env.ZIP_NAME }}
63+
cd archive
64+
tar -jcvf ${{ env.ZIP_NAME }}_${{ runner.os }}.tar.bz2 ${{ env.ZIP_NAME }}
5565
5666
- name: Create Release Draft
57-
id: create_release
58-
uses: actions/create-release@v1
59-
env:
60-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
67+
id: create-release
68+
uses: softprops/action-gh-release@v1
6169
with:
62-
tag_name: ${{ github.ref }}
63-
release_name: ${{ github.ref }}
70+
tag_name: ${{ steps.check-tag.outputs.tag }}
71+
name: ${{ steps.check-tag.outputs.tag }}
6472
body: |
6573
Changelog
6674
- First Change
6775
- Second Change
6876
draft: true
6977
prerelease: false
70-
71-
- name: Upload Release Asset for ubuntu
72-
id: upload-release-asset-ubuntu
73-
uses: actions/upload-release-asset@v1
78+
79+
- name: Upload Release Asset
7480
env:
7581
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
76-
with:
77-
upload_url: ${{ steps.create_release.outputs.upload_url }}
78-
asset_path: ../release/${{ env.ZIP_NAME }}.tar.bz2
79-
asset_name: ${{ env.ZIP_NAME }}-${{ runner.os }}.tar.bz2
80-
asset_content_type: application/zip
82+
run: gh release upload ${{ steps.check-tag.outputs.tag }} archive/${{ env.ZIP_NAME }}_${{ runner.os }}.tar.bz2

0 commit comments

Comments
 (0)