Skip to content

Fix build when all architecture is used #26

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

Merged
merged 1 commit into from
May 8, 2023
Merged

Fix build when all architecture is used #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: ${{ matrix.suite }}-${{ matrix.architecture }}-tarballs
path: fs-cook/out/${{ matrix.suite }}-${{ matrix.variant }}-${{ matrix.architecture }}.tar.gz
path: fs-cook/out/${{ matrix.suite }}-${{ matrix.variant }}-**.tar.gz

create-release:
runs-on: ubuntu-latest
Expand Down
12 changes: 7 additions & 5 deletions gen_data/gen-suite-matrix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,14 @@

SUITES_DIR="./suites/*"

# ARCHITECTURE CAN BE: all, amd64, arm64, armhf
# ARCHITECTURE CAN BE: amd64, arm64, armhf
# it has high priority over the architecture specified in the suite
# set it to "all" to build all architectures defined in the <suite>/<varient>.sh file
ARCHITECTURES = [ "all" ]
# "all" is currently broken!
ARCHITECTURES = [ "all" ] #, "arm64", "armhf" ]

def generate_matrix_json() -> None:
# Can be moved to utils?
def generate_matrix_json() -> str:
json_data = { "include": [ ] }

for arch in ARCHITECTURES:
Expand All @@ -24,7 +26,7 @@ def generate_matrix_json() -> None:

json_data['include'].append(element)

print(json.dumps(json_data, sort_keys=True, indent=None, separators=(',', ':')))
return json.dumps(json_data, indent=None)

if __name__ == '__main__':
generate_matrix_json()
print(generate_matrix_json())