Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FL-3359] github: added debugapps artifact; packaging resources per-target #2750

Merged
merged 6 commits into from
Jun 8, 2023
Merged

[FL-3359] github: added debugapps artifact; packaging resources per-target #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ae60625
github: added debugapps artifact; packaging resources per-target
hedger Jun 8, 2023
b6c461d
github: target name fixes
hedger Jun 8, 2023
86323de
github: fixed path for debug apps
hedger Jun 8, 2023
6529ff0
scripts: dist: removed lib stub artifact
hedger Jun 8, 2023
40ed7d9
scripts: fixed broken SDK
hedger Jun 8, 2023
a3fd8df
github: removed unused step
hedger Jun 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 10 additions & 19 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,8 @@ jobs:

- name: 'Make artifacts directory'
run: |
rm -rf artifacts
rm -rf map_analyser_files
mkdir artifacts
mkdir map_analyser_files
rm -rf artifacts map_analyser_files
mkdir artifacts map_analyser_files

- name: 'Bundle scripts'
if: ${{ !github.event.pull_request.head.repo.fork }}
Expand All @@ -66,28 +64,21 @@ jobs:
run: |
set -e
for TARGET in ${TARGETS}; do
TARGET="$(echo "${TARGET}" | sed 's/f//')"; \
./fbt TARGET_HW=$TARGET copro_dist updater_package \
${{ startsWith(github.ref, 'refs/tags') && 'DEBUG=0 COMPACT=1' || '' }}
done

- name: 'Move upload files'
if: ${{ !github.event.pull_request.head.repo.fork }}
run: |
set -e
for TARGET in ${TARGETS}; do
TARGET_HW="$(echo "${TARGET}" | sed 's/f//')"; \
./fbt TARGET_HW=$TARGET_HW copro_dist updater_package \
${{ startsWith(github.ref, 'refs/tags') && 'DEBUG=0 COMPACT=1' || '' }}
mv dist/${TARGET}-*/* artifacts/
tar czpf "artifacts/flipper-z-${TARGET}-resources-${SUFFIX}.tgz" \
-C assets resources
./fbt TARGET_HW=$TARGET_HW fap_dist
tar czpf "artifacts/flipper-z-${TARGET}-debugapps-${SUFFIX}.tgz" \
-C dist/${TARGET}-*/apps/Debug .
done

- name: "Check for uncommitted changes"
run: |
git diff --exit-code

- name: 'Bundle resources'
if: ${{ !github.event.pull_request.head.repo.fork }}
run: |
tar czpf "artifacts/flipper-z-any-resources-${SUFFIX}.tgz" -C assets resources

- name: 'Bundle core2 firmware'
if: ${{ !github.event.pull_request.head.repo.fork }}
run: |
Expand Down
11 changes: 0 additions & 11 deletions scripts/sconsdist.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,17 +84,6 @@ def copy_single_project(self, project: ProjectDir) -> None:
if exists(sdk_folder := join(obj_directory, foldertype)):
self.note_dist_component(foldertype, "dir", sdk_folder)

# TODO: remove this after everyone migrates to new uFBT
self.create_zip_stub("lib")

def create_zip_stub(self, foldertype):
with zipfile.ZipFile(
self.get_dist_path(self.get_dist_file_name(foldertype, "zip")),
"w",
zipfile.ZIP_DEFLATED,
) as _:
pass

def copy(self) -> int:
self._dist_components: dict[str, str] = dict()
self.projects: dict[str, ProjectDir] = dict(
Expand Down