Skip to content

Commit a362b82

Browse files
Ash-L2LAsh-L2L
committed
cli app, console tab, version bump
1 parent 229f512 commit a362b82

File tree

16 files changed

+543
-152
lines changed

16 files changed

+543
-152
lines changed

‎.github/workflows/check_lint_build.yaml‎

Lines changed: 66 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -37,32 +37,40 @@ jobs:
3737
- name: Build
3838
run: cargo build --release
3939

40-
- name: 'Set environment variables: version number and output filename'
40+
- name: 'Set environment variables: version number and output filenames'
4141
run: |
4242
THUNDER_APP_VERSION=$(cargo metadata --format-version 1 | \
4343
jq -er '.packages | map(select(.name == "thunder_app") | .version) | .[0]')
44-
OUTPUT_FILENAME="thunder-${THUNDER_APP_VERSION}-x86_64-unknown-linux-gnu"
44+
THUNDER_APP_FILENAME="thunder-${THUNDER_APP_VERSION}-x86_64-unknown-linux-gnu"
45+
THUNDER_CLI_FILENAME="thunder-cli-${THUNDER_APP_VERSION}-x86_64-unknown-linux-gnu"
4546
echo "THUNDER_APP_VERSION=$THUNDER_APP_VERSION" >> "$GITHUB_ENV"
46-
echo "OUTPUT_FILENAME=$OUTPUT_FILENAME" >> "$GITHUB_ENV"
47+
echo "THUNDER_APP_FILENAME=$THUNDER_APP_FILENAME" >> "$GITHUB_ENV"
48+
echo "THUNDER_CLI_FILENAME=$THUNDER_CLI_FILENAME" >> "$GITHUB_ENV"
4749
48-
- name: 'Set filename for release binary'
50+
51+
- name: 'Set filenames for release binaries'
4952
run: |
5053
pushd "target/release"
51-
ln -fs "thunder_app" "${OUTPUT_FILENAME}"
54+
ln -fs "thunder_app" "${THUNDER_APP_FILENAME}"
55+
ln -fs "thunder_app_cli" "${THUNDER_CLI_FILENAME}"
5256
popd
5357
5458
- name: 'Upload Artifacts (thunder)'
55-
uses: actions/upload-artifact@v2
59+
uses: actions/upload-artifact@v4
5660
with:
57-
name: ${{ env.OUTPUT_FILENAME }}
58-
path: target/release/${{ env.OUTPUT_FILENAME }}
61+
name: ${{ env.THUNDER_APP_FILENAME }}
5962
if-no-files-found: error
63+
path: |
64+
target/release/${{ env.THUNDER_APP_FILENAME }}
65+
target/release/${{ env.THUNDER_CLI_FILENAME }}
6066
6167
- name: Release
6268
uses: softprops/action-gh-release@v2.0.2
6369
if: startsWith(github.ref, 'refs/tags/')
6470
with:
65-
files: target/release/${{ env.OUTPUT_FILENAME }}
71+
files: |
72+
target/release/${{ env.THUNDER_APP_FILENAME }}
73+
target/release/${{ env.THUNDER_CLI_FILENAME }}
6674
fail_on_unmatched_files: true
6775

6876
build-macos:
@@ -86,32 +94,39 @@ jobs:
8694
- name: Build
8795
run: cargo build --release
8896

89-
- name: 'Set environment variables: version number and output filename'
97+
- name: 'Set environment variables: version number and output filenames'
9098
run: |
9199
THUNDER_APP_VERSION=$(cargo metadata --format-version 1 | \
92100
jq -er '.packages | map(select(.name == "thunder_app") | .version) | .[0]')
93-
OUTPUT_FILENAME="thunder-${THUNDER_APP_VERSION}-x86_64-apple-darwin"
101+
THUNDER_APP_FILENAME="thunder-${THUNDER_APP_VERSION}-x86_64-apple-darwin"
102+
THUNDER_CLI_FILENAME="thunder-cli-${THUNDER_APP_VERSION}-x86_64-apple-darwin"
94103
echo "THUNDER_APP_VERSION=$THUNDER_APP_VERSION" >> "$GITHUB_ENV"
95-
echo "OUTPUT_FILENAME=$OUTPUT_FILENAME" >> "$GITHUB_ENV"
104+
echo "THUNDER_APP_FILENAME=$THUNDER_APP_FILENAME" >> "$GITHUB_ENV"
105+
echo "THUNDER_CLI_FILENAME=$THUNDER_CLI_FILENAME" >> "$GITHUB_ENV"
96106
97-
- name: 'Set filename for release binary'
107+
- name: 'Set filenames for release binaries'
98108
run: |
99109
pushd "target/release"
100-
ln -fs "thunder_app" "${OUTPUT_FILENAME}"
110+
ln -fs "thunder_app" "${THUNDER_APP_FILENAME}"
111+
ln -fs "thunder_app_cli" "${THUNDER_CLI_FILENAME}"
101112
popd
102113
103114
- name: 'Upload Artifacts (thunder)'
104-
uses: actions/upload-artifact@v2
115+
uses: actions/upload-artifact@v4
105116
with:
106-
name: ${{ env.OUTPUT_FILENAME }}
107-
path: target/release/${{ env.OUTPUT_FILENAME }}
117+
name: ${{ env.THUNDER_APP_FILENAME }}
108118
if-no-files-found: error
119+
path: |
120+
target/release/${{ env.THUNDER_APP_FILENAME }}
121+
target/release/${{ env.THUNDER_CLI_FILENAME }}
109122
110123
- name: Release
111124
uses: softprops/action-gh-release@v2.0.2
112125
if: startsWith(github.ref, 'refs/tags/')
113126
with:
114-
files: target/release/${{ env.OUTPUT_FILENAME }}
127+
files: |
128+
target/release/${{ env.THUNDER_APP_FILENAME }}
129+
target/release/${{ env.THUNDER_CLI_FILENAME }}
115130
fail_on_unmatched_files: true
116131

117132
build-windows:
@@ -141,32 +156,40 @@ jobs:
141156
env:
142157
RUSTFLAGS: "-C linker=/usr/bin/x86_64-w64-mingw32-gcc"
143158

144-
- name: 'Set environment variables: version number and output filename'
159+
- name: 'Set environment variables: version number and output filenames'
145160
run: |
146161
THUNDER_APP_VERSION=$(cargo metadata --format-version 1 | \
147162
jq -er '.packages | map(select(.name == "thunder_app") | .version) | .[0]')
148-
OUTPUT_FILENAME="thunder-${THUNDER_APP_VERSION}-x86_64-pc-windows-gnu.exe"
163+
THUNDER_APP_FILENAME="thunder-${THUNDER_APP_VERSION}-x86_64-pc-windows-gnu.exe"
164+
THUNDER_CLI_FILENAME="thunder-cli-${THUNDER_APP_VERSION}-x86_64-pc-windows-gnu.exe"
149165
echo "THUNDER_APP_VERSION=$THUNDER_APP_VERSION" >> "$GITHUB_ENV"
150-
echo "OUTPUT_FILENAME=$OUTPUT_FILENAME" >> "$GITHUB_ENV"
166+
echo "THUNDER_APP_FILENAME=$THUNDER_APP_FILENAME" >> "$GITHUB_ENV"
167+
echo "THUNDER_CLI_FILENAME=$THUNDER_CLI_FILENAME" >> "$GITHUB_ENV"
168+
151169
152-
- name: 'Set filename for release binary'
170+
- name: 'Set filenames for release binaries'
153171
run: |
154172
pushd "target/x86_64-pc-windows-gnu/release"
155-
ln -fs "thunder_app.exe" "${OUTPUT_FILENAME}"
173+
ln -fs "thunder_app.exe" "${THUNDER_APP_FILENAME}"
174+
ln -fs "thunder_app_cli.exe" "${THUNDER_CLI_FILENAME}"
156175
popd
157176
158177
- name: 'Upload Artifacts (thunder)'
159-
uses: actions/upload-artifact@v2
178+
uses: actions/upload-artifact@v4
160179
with:
161-
name: ${{ env.OUTPUT_FILENAME }}
162-
path: target/x86_64-pc-windows-gnu/release/${{ env.OUTPUT_FILENAME }}
180+
name: ${{ env.THUNDER_APP_FILENAME }}
163181
if-no-files-found: error
182+
path: |
183+
target/x86_64-pc-windows-gnu/release/${{ env.THUNDER_APP_FILENAME }}
184+
target/x86_64-pc-windows-gnu/release/${{ env.THUNDER_CLI_FILENAME }}
164185
165186
- name: Release
166187
uses: softprops/action-gh-release@v2.0.2
167188
if: startsWith(github.ref, 'refs/tags/')
168189
with:
169-
files: target/x86_64-pc-windows-gnu/release/${{ env.OUTPUT_FILENAME }}
190+
files: |
191+
target/x86_64-pc-windows-gnu/release/${{ env.THUNDER_APP_FILENAME }}
192+
target/x86_64-pc-windows-gnu/release/${{ env.THUNDER_CLI_FILENAME }}
170193
fail_on_unmatched_files: true
171194

172195
upload-releases-to-releases-drivechain-info:
@@ -182,12 +205,22 @@ jobs:
182205

183206
- name: Create zip files for releases.drivechain.info
184207
run: |
185-
mv thunder-*-x86_64-apple-darwin thunder-latest-x86_64-apple-darwin
186-
zip L2-S9-Thunder-latest-x86_64-apple-darwin.zip thunder-latest-x86_64-apple-darwin
187-
mv thunder-*-x86_64-pc-windows-gnu.exe thunder-latest-x86_64-pc-windows-gnu.exe
188-
zip L2-S9-Thunder-latest-x86_64-pc-windows-gnu.zip thunder-latest-x86_64-pc-windows-gnu.exe
189-
mv thunder-*-x86_64-unknown-linux-gnu thunder-latest-x86_64-unknown-linux-gnu
190-
zip L2-S9-Thunder-latest-x86_64-unknown-linux-gnu.zip thunder-latest-x86_64-unknown-linux-gnu
208+
shopt -s extglob
209+
mv thunder-+([0-9]).+([0-9]).+([0-9])-x86_64-apple-darwin thunder-latest-x86_64-apple-darwin
210+
mv thunder-cli-+([0-9]).+([0-9]).+([0-9])-x86_64-apple-darwin thunder-cli-latest-x86_64-apple-darwin
211+
zip L2-S9-Thunder-latest-x86_64-apple-darwin.zip \
212+
thunder-latest-x86_64-apple-darwin \
213+
thunder-cli-latest-x86_64-apple-darwin
214+
mv thunder-+([0-9]).+([0-9]).+([0-9])-x86_64-pc-windows-gnu.exe thunder-latest-x86_64-pc-windows-gnu.exe
215+
mv thunder-cli-+([0-9]).+([0-9]).+([0-9])-x86_64-pc-windows-gnu.exe thunder-cli-latest-x86_64-pc-windows-gnu.exe
216+
zip L2-S9-Thunder-latest-x86_64-pc-windows-gnu.zip \
217+
thunder-latest-x86_64-pc-windows-gnu.exe \
218+
thunder-cli-latest-x86_64-pc-windows-gnu.exe
219+
mv thunder-+([0-9]).+([0-9]).+([0-9])-x86_64-unknown-linux-gnu thunder-latest-x86_64-unknown-linux-gnu
220+
mv thunder-cli-+([0-9]).+([0-9]).+([0-9])-x86_64-unknown-linux-gnu thunder-cli-latest-x86_64-unknown-linux-gnu
221+
zip L2-S9-Thunder-latest-x86_64-unknown-linux-gnu.zip \
222+
thunder-latest-x86_64-unknown-linux-gnu \
223+
thunder-cli-latest-x86_64-unknown-linux-gnu
191224
192225
- name: Upload release assets to releases.drivechain.info
193226
uses: cross-the-world/ssh-scp-ssh-pipelines@latest

0 commit comments

Comments
 (0)