Skip to content

Commit b348254

Browse files
committed
Fix up dev workflow and various cleanup.
1 parent 92e6d7a commit b348254

File tree

4 files changed

+22
-21
lines changed

4 files changed

+22
-21
lines changed

.github/workflows/build-dev.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
name: "Dev Branch - Build & Upload FAP"
1+
name: "Dev - Build & Upload FAP"
22
on:
33
push:
44
branches:
55
- dev
66
jobs:
77
ufbt-build-action:
88
runs-on: ubuntu-latest
9-
name: "Build: ${{ matrix.name }}."
9+
name: "Build: Dev"
1010
steps:
11-
- name: "Checkout."
11+
- name: "Checkout"
1212
uses: actions/checkout@v3
1313
with:
1414
submodules: recursive
1515

1616
# Flipper Zero ufbt action
1717
# https://github.com/flipperdevices/flipperzero-ufbt-action
18-
- name: "Build app."
18+
- name: "Build"
1919
uses: flipperdevices/flipperzero-ufbt-action@v0.1
2020
id: build-app
2121
with:
2222
app-dir: ./fap
2323
sdk-channel: dev
2424

25-
- name: "Create zip archive (dev)"
25+
- name: "Create Zip Archive (dev)"
2626
uses: actions/upload-artifact@v3
2727
with:
2828
name: ${{ github.event.repository.name }}-dev-${{ steps.build-app.outputs.suffix }}.zip

.github/workflows/build-release.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Release Branch - Build & Upload FAP"
1+
name: "Release - Build & Upload FAP"
22
on:
33
push:
44
branches:
@@ -22,23 +22,23 @@ jobs:
2222
- name: "release"
2323
sdk-channel: release
2424

25-
name: "Build: ${{ matrix.name }}."
25+
name: "Build: ${{ matrix.name }}"
2626
steps:
27-
- name: "Checkout."
27+
- name: "Checkout"
2828
uses: actions/checkout@v3
2929
with:
3030
submodules: recursive
3131

3232
# Flipper Zero ufbt action
3333
# https://github.com/flipperdevices/flipperzero-ufbt-action
34-
- name: "Build app."
34+
- name: "Build"
3535
uses: flipperdevices/flipperzero-ufbt-action@v0.1
3636
id: build-app
3737
with:
3838
app-dir: ./fap
3939
sdk-channel: ${{ matrix.sdk-channel }}
4040

41-
- name: "Create zip archives (dev/release/rc)"
41+
- name: "Create Zip Archives (dev/release/rc)"
4242
uses: actions/upload-artifact@v3
4343
with:
4444
name: ${{ github.event.repository.name }}-${{ matrix.name }}-${{ steps.build-app.outputs.suffix }}.zip

.github/workflows/pull-request-dev.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
1-
name: "Dev Branch PR - Lint & Build Test"
1+
name: "Dev PR - Lint & Build Test"
22
on:
33
pull_request:
44
branches:
55
- dev
66
jobs:
77
ufbt-test-build-action:
88
runs-on: ubuntu-latest
9-
name: "PR Build: ${{ matrix.name }}."
9+
name: "PR Build: dev"
1010
steps:
11-
- name: "PR - Checkout."
11+
- name: "Checkout"
1212
uses: actions/checkout@v3
1313
with:
1414
submodules: recursive
1515

1616
# Flipper Zero ufbt action
1717
# https://github.com/flipperdevices/flipperzero-ufbt-action
18-
- name: "PR - Build app."
18+
- name: "Build"
1919
uses: flipperdevices/flipperzero-ufbt-action@v0.1
2020
id: build-app
2121
with:
2222
app-dir: ./fap
23-
sdk-channel: ${{ matrix.sdk-channel }}
23+
sdk-channel: dev
2424

25-
- name: "PR - Lint."
25+
- name: "Lint"
2626
uses: flipperdevices/flipperzero-ufbt-action@v0.1
2727
with:
2828
app-dir: ./fap

.github/workflows/pull-request-release.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
1-
name: "Release Branch PR - Lint & Build Test"
1+
name: "Release PR - Lint & Build Test"
22
on:
33
pull_request:
44
branches:
55
- main
66
jobs:
77
ufbt-test-build-action:
88
runs-on: ubuntu-latest
9+
# The following builds must pass before release is accepted:
910
strategy:
1011
matrix:
1112
include:
@@ -18,23 +19,23 @@ jobs:
1819
- name: "release"
1920
sdk-channel: release
2021

21-
name: "PR Build: ${{ matrix.name }}."
22+
name: "PR Build: ${{ matrix.name }}"
2223
steps:
23-
- name: "PR - Checkout."
24+
- name: "Checkout"
2425
uses: actions/checkout@v3
2526
with:
2627
submodules: recursive
2728

2829
# Flipper Zero ufbt action
2930
# https://github.com/flipperdevices/flipperzero-ufbt-action
30-
- name: "PR - Build app."
31+
- name: "Build"
3132
uses: flipperdevices/flipperzero-ufbt-action@v0.1
3233
id: build-app
3334
with:
3435
app-dir: ./fap
3536
sdk-channel: ${{ matrix.sdk-channel }}
3637

37-
- name: "PR - Lint."
38+
- name: "Lint"
3839
uses: flipperdevices/flipperzero-ufbt-action@v0.1
3940
with:
4041
app-dir: ./fap

0 commit comments

Comments
 (0)