|
|
@@ -20,14 +20,13 @@ permissions:
|
|
|
|
|
|
jobs:
|
|
|
build-and-upload:
|
|
|
- # runs-on: [self-hosted, linux]
|
|
|
runs-on: ubuntu-latest
|
|
|
concurrency:
|
|
|
group: firmware-build-${{ vars.FIRMWARE_VERSION }}-${{ vars.RELEASE_VERSION }}
|
|
|
cancel-in-progress: false
|
|
|
env:
|
|
|
REPO_SELF: ${{ vars.REPO_SELF }}
|
|
|
- IGNORED_PATH: "applications_user/subbrute"
|
|
|
+ OFW_PATH: "applications_user/subbrute"
|
|
|
RELATIVE_PATH: "applications/external/subbrute"
|
|
|
CURRENT_VERSION: ${{ vars.RELEASE_VERSION }}
|
|
|
RELEASE_VERSION: ${{ vars.RELEASE_VERSION }}
|
|
|
@@ -44,9 +43,9 @@ jobs:
|
|
|
url: ${{ vars.REPO_UNLEASHED }}
|
|
|
version: ${{ vars.FIRMWARE_VERSION }}
|
|
|
src-included: 1
|
|
|
- #- firmware: official
|
|
|
- # url: ${{ vars.REPO_OFFICIAL }}
|
|
|
- # version: "official"
|
|
|
+ - firmware: official
|
|
|
+ url: ${{ vars.REPO_OFFICIAL }}
|
|
|
+ version: "official"
|
|
|
steps:
|
|
|
- name: Set version
|
|
|
env:
|
|
|
@@ -72,7 +71,7 @@ jobs:
|
|
|
repository: "${{ vars.REPO_SELF }}"
|
|
|
clean: "true"
|
|
|
submodules: "true"
|
|
|
- path: "${{ env.IGNORED_PATH }}"
|
|
|
+ path: "${{ env.OFW_PATH }}"
|
|
|
|
|
|
- name: Print vars about state or repo if Unleashed
|
|
|
if: ${{ matrix.src-included == 1 }}
|
|
|
@@ -81,7 +80,7 @@ jobs:
|
|
|
git log --pretty=format:'%s by %C(yellow)%an%Creset (%ad)%n %n%b' --date=local --abbrev-commit --max-count=1
|
|
|
git submodule set-branch --branch master '${{ env.RELATIVE_PATH }}'
|
|
|
git submodule sync '${{ env.RELATIVE_PATH }}'
|
|
|
- cd '${{ env.RELATIVE_PATH }}'
|
|
|
+ cd '${{ env.OFW_PATH }}'
|
|
|
if ( '${{ env.CURRENT_VERSION }}' -ne '${{ env.RELEASE_VERSION }}' ) {
|
|
|
Write-Output '::warning title=Different version::Current version is ${{ env.CURRENT_VERSION }} but we trying to build ${{ env.RELEASE_VERSION }}'
|
|
|
git checkout tags/v${{ env.RELEASE_VERSION }} -b tmp-build
|
|
|
@@ -105,7 +104,7 @@ jobs:
|
|
|
shell: pwsh
|
|
|
run: |
|
|
|
git log --pretty=format:'%s by %C(yellow)%an%Creset (%ad)%n %n%b' --date=local --abbrev-commit --max-count=1
|
|
|
- cd '${{ env.IGNORED_PATH }}'
|
|
|
+ cd '${{ env.OFW_PATH }}'
|
|
|
|
|
|
if ( '${{ env.CURRENT_VERSION }}' -ne '${{ env.RELEASE_VERSION }}' ) {
|
|
|
Write-Output '::warning title=Different version::Current version is ${{ env.CURRENT_VERSION }} but we trying to build ${{ env.RELEASE_VERSION }}'
|
|
|
@@ -144,7 +143,7 @@ jobs:
|
|
|
rm -Rf ./applications/debug ./applications/examples
|
|
|
mkdir ./tmp
|
|
|
mv ./applications/external/application.fam ./tmp/
|
|
|
- mv -f ./applications/external/subbrute/ ./tmp/
|
|
|
+ mv -fv ./applications/external/subbrute/ ./tmp/
|
|
|
rm -Rf ./applications/external/*
|
|
|
mv -f ./tmp/* ./applications/external/
|
|
|
rm -Rf ./tmp/
|
|
|
@@ -166,7 +165,7 @@ jobs:
|
|
|
FBT_NO_SYNC: 0
|
|
|
DIST_SUFFIX: ${{ matrix.version }}
|
|
|
WORKFLOW_BRANCH_OR_TAG: release-cfw
|
|
|
- # rm to remove problem FAP which includes non existent files
|
|
|
+ # rm to remove problem FAP which includes non-existent files
|
|
|
run: |
|
|
|
./fbt COMPACT=1 DEBUG=0 FBT_NO_SYNC=0 fap_dist
|
|
|
|
DerSkythe