forked from flipperdevices/flipperzero-firmware
-
-
Notifications
You must be signed in to change notification settings - Fork 545
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #46 from CodyTolene/dev
[Dev -> Main] v1.7.0 (F0 v0.98-rc+ support)
- Loading branch information
Showing
37 changed files
with
437 additions
and
588 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| #!/bin/bash | ||
|
|
||
| # Run ufbt lint in the "fap" folder | ||
| fap_folder="fap" | ||
|
|
||
| # Change to the root directory of the repository | ||
| cd "$(git rev-parse --show-toplevel)" | ||
|
|
||
| # Run ufbt lint in the "fap" folder | ||
| if ! (cd "$fap_folder" && ufbt lint); then | ||
| echo "Error: ufbt lint failed in the 'fap' folder. Please fix the issues before committing." | ||
| exit 1 | ||
| else | ||
| echo "ufbt lint passed in the 'fap' folder." | ||
| fi | ||
|
|
||
| # If everything is okay, exit with a zero status | ||
| exit 0 |
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| name: "Dev - Build & Upload FAP" | ||
| on: | ||
| push: | ||
| branches: | ||
| - dev | ||
| jobs: | ||
| ufbt-build-action: | ||
| runs-on: ubuntu-latest | ||
| name: "Build: Dev" | ||
| steps: | ||
| - name: "Checkout" | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| # Flipper Zero ufbt action | ||
| # https://github.com/flipperdevices/flipperzero-ufbt-action | ||
| - name: "Build" | ||
| uses: flipperdevices/[email protected] | ||
| id: build-app | ||
| with: | ||
| app-dir: ./fap | ||
| sdk-channel: dev | ||
|
|
||
| - name: "Create FAP Download (dev)" | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: ${{ github.event.repository.name }}-dev-${{ steps.build-app.outputs.suffix }}.zip | ||
| path: ${{ steps.build-app.outputs.fap-artifacts }} |
32 changes: 16 additions & 16 deletions
32
.github/workflows/deploy-main.yml → .github/workflows/build-release.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,44 @@ | ||
| name: "Build + upload." | ||
| name: "Release - Build & Upload FAP" | ||
| on: | ||
| push: | ||
| branches: | ||
| # Run on push to main. | ||
| - main | ||
|
|
||
| schedule: | ||
| # Run every day at 00:00 UTC (midnight) | ||
| # Run every day at 00:00 UTC (midnight) to build the latest release | ||
| # for new and upcoming firmware. | ||
| - cron: "0 0 * * *" | ||
|
|
||
| jobs: | ||
| ufbt-build-action: | ||
| runs-on: ubuntu-latest | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| # - name: dev | ||
| # sdk-channel: dev | ||
| - name: "dev" | ||
| sdk-channel: dev | ||
|
|
||
| - name: release | ||
| sdk-channel: release | ||
| - name: "rc" | ||
| sdk-channel: rc | ||
|
|
||
| # - name: rc | ||
| # sdk-channel: rc | ||
| - name: "release" | ||
| sdk-channel: release | ||
|
|
||
| name: "ufbt: Build for ${{ matrix.name }}" | ||
| name: "Build: ${{ matrix.name }}" | ||
| steps: | ||
| - name: Checkout | ||
| - name: "Checkout" | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| - name: Build with ufbt | ||
| uses: flipperdevices/[email protected] | ||
| # Flipper Zero ufbt action | ||
| # https://github.com/flipperdevices/flipperzero-ufbt-action | ||
| - name: "Build" | ||
| uses: flipperdevices/[email protected] | ||
| id: build-app | ||
| with: | ||
| app-dir: ./fap | ||
| sdk-channel: ${{ matrix.sdk-channel }} | ||
|
|
||
| - name: Upload app artifacts | ||
| - name: "Create FAP Downloads (dev/release/rc)" | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: ${{ github.event.repository.name }}-${{ matrix.name }}-${{ steps.build-app.outputs.suffix }}.zip | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| name: "Dev PR - Lint & Build Test" | ||
| on: | ||
| pull_request: | ||
| branches: | ||
| - dev | ||
| jobs: | ||
| ufbt-test-build-action: | ||
| runs-on: ubuntu-latest | ||
| name: "PR Build: dev" | ||
| steps: | ||
| - name: "Checkout" | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| # Flipper Zero ufbt action | ||
| # https://github.com/flipperdevices/flipperzero-ufbt-action | ||
| - name: "Build" | ||
| uses: flipperdevices/[email protected] | ||
| id: build-app | ||
| with: | ||
| app-dir: ./fap | ||
| sdk-channel: dev | ||
|
|
||
| - name: "Lint" | ||
| uses: flipperdevices/[email protected] | ||
| with: | ||
| app-dir: ./fap | ||
| skip-setup: true | ||
| task: lint |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| name: "Release PR - Lint & Build Test" | ||
| on: | ||
| pull_request: | ||
| branches: | ||
| - main | ||
| jobs: | ||
| ufbt-test-build-action: | ||
| runs-on: ubuntu-latest | ||
| # The following builds must pass before release is accepted: | ||
| strategy: | ||
| matrix: | ||
| include: | ||
| - name: "dev" | ||
| sdk-channel: dev | ||
|
|
||
| - name: "rc" | ||
| sdk-channel: rc | ||
|
|
||
| - name: "release" | ||
| sdk-channel: release | ||
|
|
||
| name: "PR Build: ${{ matrix.name }}" | ||
| steps: | ||
| - name: "Checkout" | ||
| uses: actions/checkout@v3 | ||
| with: | ||
| submodules: recursive | ||
|
|
||
| # Flipper Zero ufbt action | ||
| # https://github.com/flipperdevices/flipperzero-ufbt-action | ||
| - name: "Build" | ||
| uses: flipperdevices/[email protected] | ||
| id: build-app | ||
| with: | ||
| app-dir: ./fap | ||
| sdk-channel: ${{ matrix.sdk-channel }} | ||
|
|
||
| - name: "Lint" | ||
| uses: flipperdevices/[email protected] | ||
| with: | ||
| app-dir: ./fap | ||
| skip-setup: true | ||
| task: lint | ||
|
|
||
| - name: "Create FAP Download Pre Release (${{ matrix.name }})" | ||
| uses: actions/upload-artifact@v3 | ||
| with: | ||
| name: ${{ github.event.repository.name }}-${{ matrix.name }}-${{ steps.build-app.outputs.suffix }}.zip | ||
| path: ${{ steps.build-app.outputs.fap-artifacts }} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.