From 9617fb6899823982562c42bf7e62a44bc1e716c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 25 Apr 2023 09:54:26 +0200 Subject: [PATCH 1/3] ci: Debugging m1 build --- .circleci/config.yml | 13 +++++++------ .circleci/template.yml | 13 +++++++------ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index e3eb1c089..0efc8490c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -63,7 +63,7 @@ commands: name: Install Rust command: | curl https://sh.rustup.rs -sSf | sh -s -- -y - - run: make deps lotus + - run: make deps download-params: steps: - restore_cache: @@ -304,9 +304,7 @@ jobs: darwin: true darwin-architecture: arm64 - run: | - export CPATH=$(brew --prefix)/include - export LIBRARY_PATH=$(brew --prefix)/lib - make lotus lotus-miner lotus-worker + export CPATH=$(brew --prefix)/include && export LIBRARY_PATH=$(brew --prefix)/lib && make lotus lotus-miner lotus-worker - run: otool -hv lotus - run: name: check tag and version output match @@ -1069,6 +1067,7 @@ workflows: branches: only: - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/ + - /^ci\/.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ @@ -1078,6 +1077,7 @@ workflows: branches: only: - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/ + - /^ci\/.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ @@ -1087,6 +1087,7 @@ workflows: branches: only: - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/ + - /^ci\/.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ @@ -1098,8 +1099,8 @@ workflows: - "Build ( darwin / arm64 )" filters: branches: - ignore: - - /.*/ + only: + - /^ci\/.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ diff --git a/.circleci/template.yml b/.circleci/template.yml index 382965615..8393eec5b 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -63,7 +63,7 @@ commands: name: Install Rust command: | curl https://sh.rustup.rs -sSf | sh -s -- -y - - run: make deps lotus + - run: make deps download-params: steps: - restore_cache: @@ -304,9 +304,7 @@ jobs: darwin: true darwin-architecture: arm64 - run: | - export CPATH=$(brew --prefix)/include - export LIBRARY_PATH=$(brew --prefix)/lib - make lotus lotus-miner lotus-worker + export CPATH=$(brew --prefix)/include && export LIBRARY_PATH=$(brew --prefix)/lib && make lotus lotus-miner lotus-worker - run: otool -hv lotus - run: name: check tag and version output match @@ -583,6 +581,7 @@ workflows: branches: only: - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/ + - /^ci\/.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ @@ -592,6 +591,7 @@ workflows: branches: only: - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/ + - /^ci\/.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ @@ -601,6 +601,7 @@ workflows: branches: only: - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/ + - /^ci\/.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ @@ -612,8 +613,8 @@ workflows: - "Build ( darwin / arm64 )" filters: branches: - ignore: - - /.*/ + only: + - /^ci\/.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ From dc805eb749810ade3e735dc54f7706fc13527fe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 25 Apr 2023 10:24:18 +0200 Subject: [PATCH 2/3] temp drop m1 from releases --- .circleci/config.yml | 1 - .circleci/template.yml | 1 - 2 files changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0efc8490c..a94329d81 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1096,7 +1096,6 @@ workflows: requires: - "Build ( darwin / amd64 )" - "Build ( linux / amd64 )" - - "Build ( darwin / arm64 )" filters: branches: only: diff --git a/.circleci/template.yml b/.circleci/template.yml index 8393eec5b..ed5ba4850 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -610,7 +610,6 @@ workflows: requires: - "Build ( darwin / amd64 )" - "Build ( linux / amd64 )" - - "Build ( darwin / arm64 )" filters: branches: only: From 4302bc02d6d06517a20251190d4b9030e5b34346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Magiera?= Date: Tue, 25 Apr 2023 10:25:40 +0200 Subject: [PATCH 3/3] ci: run release on ci/ branches, include m1 --- .circleci/config.yml | 6 ++++-- .circleci/template.yml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a94329d81..9038fdb8f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1096,10 +1096,11 @@ workflows: requires: - "Build ( darwin / amd64 )" - "Build ( linux / amd64 )" + - "Build ( darwin / arm64 )" filters: branches: - only: - - /^ci\/.*$/ + ignore: + - /^.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ @@ -1114,6 +1115,7 @@ workflows: branches: only: - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/ + - /^ci\/.*$/ - build-docker: name: "Docker push (lotus-all-in-one / stable / mainnet)" image: lotus-all-in-one diff --git a/.circleci/template.yml b/.circleci/template.yml index ed5ba4850..cd8aeb663 100644 --- a/.circleci/template.yml +++ b/.circleci/template.yml @@ -610,10 +610,11 @@ workflows: requires: - "Build ( darwin / amd64 )" - "Build ( linux / amd64 )" + - "Build ( darwin / arm64 )" filters: branches: - only: - - /^ci\/.*$/ + ignore: + - /^.*$/ tags: only: - /^v\d+\.\d+\.\d+(-rc\d+)?$/ @@ -628,6 +629,7 @@ workflows: branches: only: - /^release\/v\d+\.\d+\.\d+(-rc\d+)?$/ + - /^ci\/.*$/ [[- range .Networks]] - build-docker: name: "Docker push (lotus-all-in-one / stable / [[.]])"