Skip to content

Commit

Permalink
Revert "Build wkdev-sdk for non-amd64 6architectures."
Browse files Browse the repository at this point in the history
This reverts commit eefcfff.

Deployment fails.
  • Loading branch information
TingPing committed May 16, 2024
1 parent 1d74716 commit d8f056d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/wkdev-sdk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,16 @@ jobs:
remove-codeql: true
remove-docker-images: true

- name: Install dependencies
run: sudo apt-get update && sudo apt-get -y install podman fuse-overlayfs qemu-user-static
- name: Install podman
run: sudo apt-get update && sudo apt-get -y install podman fuse-overlayfs

- name: Checkout repo
uses: actions/checkout@v4

- name: Build image
run: |
source ./register-sdk-on-host.sh
wkdev-sdk-bakery --mode=build --platforms=linux/arm/v7,linux/amd64 --verbose
wkdev-sdk-bakery --mode=build --verbose
wkdev-sdk-bakery --mode=export --verbose
- name: Archive image
Expand Down
9 changes: 2 additions & 7 deletions scripts/host-only/wkdev-sdk-bakery
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ argsparse_use_option =verbose "Increase verbosity of this script"

argsparse_use_option =name: "Name of container image" mandatory default:wkdev-sdk
argsparse_use_option =mode: "Operation mode: 'build', 'deploy', or 'export'" mandatory
argsparse_use_option =platforms: "Build container for given set of platforms" mandatory default:"linux/amd64"
argsparse_use_option idle-cores: "Number of CPU cores to leave idle, when building the image" type:uint default:2

argsparse_usage_description="$(cat <<EOF
Expand All @@ -46,7 +45,6 @@ process_command_line_arguments() {
idle_cores=${program_options["idle-cores"]}

operation_mode="${program_options["mode"]}"
platforms="${program_options["platforms"]}"
[ "${operation_mode}" != 'build' ] && [ "${operation_mode}" != 'deploy' ] && [ "${operation_mode}" != 'export' ] && _abort_ "Unknown operation mode: '${operation_mode}' (valid choices are 'build', 'deploy', or 'export')"
}

Expand All @@ -58,9 +56,7 @@ build_image() {

pushd "$(get_image_directory_by_name "${container_image_name}")" &>/dev/null
timer_start
run_podman_silent manifest rm "$(get_tag_for_build)"
run_podman_silent_unless_verbose manifest create "$(get_tag_for_build)" || _abort_ "Container image manifest creation failed"
run_podman_silent_unless_verbose build --jobs $(get_number_of_cores_for_build) --platform "${platforms}" --manifest "$(get_tag_for_build)" . || _abort_ "Container image build failed"
run_podman_silent_unless_verbose build --jobs $(get_number_of_cores_for_build) --tag "$(get_tag_for_build)" . || _abort_ "Container image build failed"
timer_stop
popd &>/dev/null
}
Expand All @@ -73,8 +69,7 @@ deploy_image() {

local image_directory="$(get_image_directory_by_name "${container_image_name}")"
pushd "${image_directory}" &>/dev/null || _abort_ "Switching to directory '${image_directory}' failed"
run_podman_silent_unless_verbose push "$(get_tag_for_build)" || _abort_ "Pushing image to registry failed"
run_podman_silent_unless_verbose manifest push "${container_image_name}:$(get_container_tag)" "docker://$(get_tag_for_build)" || _abort_ "Pushing manifest to registry failed"
run_podman_silent_unless_verbose push "$(get_tag_for_build)" || _abort_ "Pushing to registry failed"
popd &>/dev/null
}

Expand Down

0 comments on commit d8f056d

Please sign in to comment.