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

Revert temporary changes in #576 and cleanup #578

Merged
merged 4 commits into from
Oct 25, 2021
Merged

Revert temporary changes in #576 and cleanup #578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a7a9645
fix: allow spaces in project path
ivan-aksamentov Oct 25, 2021
2fcb478
chore: only consider fully static build on linux
ivan-aksamentov Oct 25, 2021
143a25a
chore: only strip executables on linux
ivan-aksamentov Oct 25, 2021
7e958cd
chore: revert temp changes
ivan-aksamentov Oct 25, 2021
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
46 changes: 23 additions & 23 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ jobs:
name: Run macOS << parameters.macos_arch >> build
command: |
source .cache/venv/bin/activate
echo "DATA_FULL_DOMAIN=https://data.master.clades.nextstrain.org" >> .env
echo "DATA_FULL_DOMAIN=${DATA_FULL_DOMAIN}" >> .env
make prod
environment:
CONAN_USER_HOME: '/Users/distiller/project/.cache'
Expand All @@ -299,36 +299,36 @@ jobs:
path: .out/bin/nextclade-MacOS-<< parameters.macos_arch >>
destination: nextclade-MacOS-<< parameters.macos_arch >>

# - run:
# name: 'Publish binaries to GitHub Releases: MacOS-<< parameters.macos_arch >>'
# command: |
# OS=darwin ./scripts/download_github_release_tool.sh
# ./scripts/publish_github_releases.sh
- run:
name: 'Publish binaries to GitHub Releases: MacOS-<< parameters.macos_arch >>'
command: |
OS=darwin ./scripts/download_github_release_tool.sh
./scripts/publish_github_releases.sh

workflows:
version: 2
build:
jobs:
# - Update-Builder-Container:
# <<: *major_branches_and_cli_release_only
#
# - Build-Web:
# context: nextclade_web_<< pipeline.git.branch >>
# <<: *major_branches_only
# requires:
# - Update-Builder-Container
#
# - Build-Linux-x86_64:
# context: nextclade_cli_<< pipeline.git.branch >>
# <<: *release_cli_only
# requires:
# - Update-Builder-Container
- Update-Builder-Container:
<<: *major_branches_and_cli_release_only

- Build-Web:
context: nextclade_web_<< pipeline.git.branch >>
<<: *major_branches_only
requires:
- Update-Builder-Container

- Build-Linux-x86_64:
context: nextclade_cli_<< pipeline.git.branch >>
<<: *release_cli_only
requires:
- Update-Builder-Container

- Build-MacOS:
# context: nextclade_cli_<< pipeline.git.branch >>
context: nextclade_cli_<< pipeline.git.branch >>
matrix:
parameters:
macos_arch:
- x86_64
# - arm64
# <<: *release_cli_only
- arm64
<<: *release_cli_only
1 change: 0 additions & 1 deletion packages/nextclade_common/src/datasets.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ namespace Nextclade {

auto numRefs = std::to_string(dataset.datasetRefs.size());
fmt::format_to(buf, "Specific reference sequences ({:}):\n", numRefs);
// fmt::format_to(buf, "-----------------------------" + std::string{"-", numRefs.size() + 3} + "\n\n");

for (const auto& datasetRef : dataset.datasetRefs) {
const auto& ref = datasetRef.reference;
Expand Down
20 changes: 9 additions & 11 deletions scripts/build_locally.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ trap "exit" INT
THIS_DIR=$(cd $(dirname "${BASH_SOURCE[0]}"); pwd)

# Where the source code is
PROJECT_ROOT_DIR="$(realpath --logical --no-symlinks ${THIS_DIR}/..)"
PROJECT_ROOT_DIR="$(realpath --logical --no-symlinks "${THIS_DIR}/..")"

source "${THIS_DIR}/lib/set_locales.sh"
source "${THIS_DIR}/lib/is_ci.sh"
Expand Down Expand Up @@ -261,7 +261,7 @@ fi

# Whether to build a standalone static executable
NEXTALIGN_STATIC_BUILD_DEFAULT=0
if [ "${CMAKE_BUILD_TYPE}" == "Release" ]; then
if [ "${BUILD_OS}" == "Linux" ] && [ "${CMAKE_BUILD_TYPE}" == "Release" ]; then
NEXTALIGN_STATIC_BUILD_DEFAULT=1
elif [ "${CMAKE_BUILD_TYPE}" == "ASAN" ] || [ "${CMAKE_BUILD_TYPE}" == "MSAN" ] || [ "${CMAKE_BUILD_TYPE}" == "TSAN" ] || [ "${CMAKE_BUILD_TYPE}" == "UBSAN" ] ; then
NEXTALIGN_STATIC_BUILD_DEFAULT=0
Expand Down Expand Up @@ -747,13 +747,9 @@ pushd "${BUILD_DIR}" > /dev/null
function strip_executable() {
CLI=${1}

print 29 "Strip executable";
# Strip works differently on mac
if [ "${BUILD_OS}" == "MacOS" ]; then
strip ${CLI}
if [ "${BUILD_OS}" == "Linux" ]; then
print 29 "Strip executable";

ls -l ${CLI}
elif [ "${BUILD_OS}" == "Linux" ]; then
strip -s \
--strip-unneeded \
--remove-section=.note.gnu.gold-version \
Expand All @@ -763,10 +759,12 @@ pushd "${BUILD_DIR}" > /dev/null
--remove-section=.note.ABI-tag \
${CLI}

ls --human-readable --kibibytes -Sl ${CLI}
fi

print 28 "Print executable info";

ls --human-readable --kibibytes -Sl ${CLI}

file ${CLI}

if [ "${BUILD_OS}" == "Linux" ] && [ "${NEXTALIGN_STATIC_BUILD}" == "1" ]; then
Expand All @@ -787,9 +785,9 @@ pushd "${BUILD_DIR}" > /dev/null
print 30 "Install executable";
cmake --install "${BUILD_DIR}" --config "${CMAKE_BUILD_TYPE}" --strip

# strip_executable "${NEXTALIGN_CLI}"
strip_executable "${NEXTALIGN_CLI}"

# strip_executable "${NEXTCLADE_CLI}"
strip_executable "${NEXTCLADE_CLI}"

fi

Expand Down