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

Jump to bottom

BUILD: Move shasum and windows specific in make.sh #2586

Closed
wants to merge 5 commits into from
Closed

BUILD: Move shasum and windows specific in make.sh #2586

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e30558a
adding sha256sum
Oct 5, 2023
5e36950
adding zip package for windows and shasum
Oct 16, 2023
a1e6123
removing zip and shasum step from workflow files
Oct 16, 2023
389343f
using pkg_type to make packaging genereic
Oct 17, 2023
f5596de
adding zip parameter in build pipeline
Oct 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
23 changes: 1 addition & 22 deletions .github/workflows/build-release.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32
path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.tar.gz
path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.zip

osx-x64:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -153,33 +153,12 @@ jobs:
- name: Get artifacts
uses: actions/download-artifact@v3

- name: zip package for win-x64
run: |
set -e; ver=${{ env.BUILD_VERSION }}
cd defichain-${ver}-x86_64-w64-mingw32
tar xzf defichain-${ver}-x86_64-w64-mingw32.tar.gz
zip -r "defichain-${ver}-x86_64-w64-mingw32.zip" defichain-${ver}/

- name: Get release
id: get_release
uses: bruceadams/get-release@v1.3.2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Generate SHA256 checksum
run: |
set -e; ver=${{ env.BUILD_VERSION }}
(cd ./defichain-${ver}-x86_64-pc-linux-gnu
sha256sum ./defichain-${ver}-x86_64-pc-linux-gnu.tar.gz > ./defichain-${ver}-x86_64-pc-linux-gnu.tar.gz.SHA256)
(cd ./defichain-${ver}-aarch64-linux-gnu
sha256sum ./defichain-${ver}-aarch64-linux-gnu.tar.gz > ./defichain-${ver}-aarch64-linux-gnu.tar.gz.SHA256)
(cd ./defichain-${ver}-x86_64-w64-mingw32
sha256sum ./defichain-${ver}-x86_64-w64-mingw32.zip > ./defichain-${ver}-x86_64-w64-mingw32.zip.SHA256)
(cd ./defichain-${ver}-x86_64-apple-darwin
sha256sum ./defichain-${ver}-x86_64-apple-darwin.tar.gz > ././defichain-${ver}-x86_64-apple-darwin.tar.gz.SHA256)
(cd ./defichain-${ver}-aarch64-apple-darwin
sha256sum ./defichain-${ver}-aarch64-apple-darwin.tar.gz > ././defichain-${ver}-aarch64-apple-darwin.tar.gz.SHA256)

- name: Upload release asset - linux-x64
uses: actions/upload-release-asset@v1
env:
Expand Down
23 changes: 1 addition & 22 deletions .github/workflows/build-staging.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ jobs:
uses: actions/upload-artifact@v3
with:
name: defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32
path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.tar.gz
path: ./build/defichain-${{ env.BUILD_VERSION }}-x86_64-w64-mingw32.zip

osx-x64:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -132,24 +132,3 @@ jobs:

- name: Get artifacts
uses: actions/download-artifact@v3

- name: zip package for win-x64
run: |
set -e; ver=${{ env.BUILD_VERSION }}
cd defichain-${ver}-x86_64-w64-mingw32
tar xzf defichain-${ver}-x86_64-w64-mingw32.tar.gz
zip -r "defichain-${ver}-x86_64-w64-mingw32.zip" defichain-${ver}/

- name: Generate SHA256 checksum
run: |
set -e; ver=${{ env.BUILD_VERSION }}
(cd ./defichain-${ver}-x86_64-pc-linux-gnu
sha256sum ./defichain-${ver}-x86_64-pc-linux-gnu.tar.gz > ./defichain-${ver}-x86_64-pc-linux-gnu.tar.gz.SHA256)
(cd ./defichain-${ver}-aarch64-linux-gnu
sha256sum ./defichain-${ver}-aarch64-linux-gnu.tar.gz > ./defichain-${ver}-aarch64-linux-gnu.tar.gz.SHA256)
(cd ./defichain-${ver}-x86_64-w64-mingw32
sha256sum ./defichain-${ver}-x86_64-w64-mingw32.zip > ./defichain-${ver}-x86_64-w64-mingw32.zip.SHA256)
(cd ./defichain-${ver}-x86_64-apple-darwin
sha256sum ./defichain-${ver}-x86_64-apple-darwin.tar.gz > ././defichain-${ver}-x86_64-apple-darwin.tar.gz.SHA256)
(cd ./defichain-${ver}-aarch64-apple-darwin
sha256sum ./defichain-${ver}-aarch64-apple-darwin.tar.gz > ././defichain-${ver}-aarch64-apple-darwin.tar.gz.SHA256)
20 changes: 15 additions & 5 deletions make.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,10 +218,13 @@ package() {
local build_dir="${BUILD_DIR}"

local pkg_name="${img_prefix}-${img_version}-${target}"
local pkg_tar_file_name="${pkg_name}.tar.gz"

local pkg_path
pkg_path="$(_canonicalize "${build_dir}/${pkg_tar_file_name}")"
if [[ "${TARGET}" == "x86_64-w64-mingw32" ]]; then
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Instead of using target here, how about taking a separate "pkg_type" local arg that takes zip or tar with tar as default so it's more generic? Or can just take a use_zip=1/0 as well to simplify.

The type based on target can be set at a higher level

pkg_path="$(_canonicalize "${build_dir}/"${pkg_name}.zip"")"
else
pkg_path="$(_canonicalize "${build_dir}/"${pkg_name}.tar.gz"")"
fi

local versioned_name="${img_prefix}-${img_version}"
local versioned_build_dir="${build_dir}/${versioned_name}"
Expand All @@ -234,8 +237,15 @@ package() {

echo "> packaging: ${pkg_name} from ${versioned_build_dir}"

_ensure_enter_dir "${versioned_build_dir}"
_tar --transform "s,^./,${versioned_name}/," -czf "${pkg_path}" ./*

if [[ "${TARGET}" == "x86_64-w64-mingw32" ]]; then
_ensure_enter_dir "${build_dir}"
zip -r "${pkg_path}" "${versioned_build_dir}/"
else
_ensure_enter_dir "${versioned_build_dir}"
_tar --transform "s,^./,${versioned_name}/," -czf "${pkg_path}" ./*
fi
sha256sum "${pkg_path}" > "${pkg_path}.SHA256"
_exit_dir

echo "> package: ${pkg_path}"
Expand Down Expand Up @@ -1165,7 +1175,7 @@ get_rust_triplet() {
}

_sign() {
# TODO: generate sha sums and sign
# TODO: sign
:
}

Expand Down