diff --git a/.buildkite/pipeline-for-tags.yml b/.buildkite/pipeline-for-tags.yml index 3677251b3..af427a36f 100644 --- a/.buildkite/pipeline-for-tags.yml +++ b/.buildkite/pipeline-for-tags.yml @@ -8,77 +8,8 @@ env: steps: - - label: Check for new Octez release - if: build.source == "schedule" && build.branch == "master" - commands: - - nix develop .#autorelease -c ./scripts/update-tezos.sh - - - label: Build ubuntu source packages - key: build-ubuntu-source-packages - if: build.tag =~ /^v.*-1/ - agents: - queue: "docker" - commands: - - eval "$SET_VERSION" - - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/build.py --type source - artifact_paths: - - ./out/* - - - label: Build fedora source packages - key: build-fedora-source-packages - if: build.tag =~ /^v.*-1/ - agents: - queue: "docker" - commands: - - eval "$SET_VERSION" - - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type source - artifact_paths: - - ./out/* - - - label: Sign ubuntu source packages - if: build.tag =~ /^v.*-1/ - depends_on: - - "build-ubuntu-source-packages" - key: sign-ubuntu-source-packages - commands: - - eval "$SET_VERSION" - - buildkite-agent artifact download "out/*" . --step build-ubuntu-source-packages - - nix develop .#docker-tezos-packages -c ./docker/build/ubuntu/sign.py -d out -i 'Serokell ' - artifact_paths: - - ./out/* - - - label: Sign fedora source packages - if: build.tag =~ /^v.*-1/ - depends_on: - - "build-fedora-source-packages" - key: sign-fedora-source-packages - commands: - - eval "$SET_VERSION" - - buildkite-agent artifact download "out/*" . --step build-fedora-source-packages - - nix develop .#docker-tezos-packages -c ./docker/build/fedora/sign.py -d out -i 'Serokell ' - artifact_paths: - - ./out/* - - - label: Publish ubuntu native packages - if: build.tag =~ /^v.*-1/ - depends_on: - - "sign-ubuntu-source-packages" - commands: - - eval "$SET_VERSION" - - buildkite-agent artifact download "out/*" . --step sign-ubuntu-source-packages - - nix develop .#buildkite -c ./docker/build/ubuntu/upload.py -d out - - - label: Publish fedora native packages - if: build.tag =~ /^v.*-1/ - depends_on: - - "sign-fedora-source-packages" - commands: - - eval "$SET_VERSION" - - buildkite-agent artifact download "out/*" . --step sign-fedora-source-packages - - nix develop .#buildkite -c ./docker/build/fedora/upload.py -d out - - label: build-via-docker - if: build.tag =~ /^v.*-1/ + if: build.tag == "test-736" key: build-via-docker commands: - eval "$SET_VERSION" @@ -90,87 +21,12 @@ steps: agents: queue: "docker" - - label: Build source packages from static binaries - key: build-source-packages-from-static-binaries - if: build.tag =~ /^v.*-1/ - agents: - queue: "docker" - depends_on: - - "build-via-docker" - commands: - - eval "$SET_VERSION" - - mkdir binaries - - buildkite-agent artifact download "docker/*" binaries --step build-via-docker - - nix develop .#docker-tezos-packages -c ./docker/build/fedora/build.py --type source --output-dir epel --binaries-dir ./binaries/docker - artifact_paths: - - ./epel/* - - - label: Sign source packages built from static binaries - key: sign-source-packages-built-from-static-binaries - if: build.tag =~ /^v.*-1/ - depends_on: - - "build-source-packages-from-static-binaries" - commands: - - eval "$SET_VERSION" - - buildkite-agent artifact download "epel/*" . --step build-source-packages-from-static-binaries - - nix develop .#docker-tezos-packages -c ./docker/build/fedora/sign.py -d epel -i 'Serokell ' - artifact_paths: - - ./epel/* - - - label: Publish epel packages - if: build.tag =~ /^v.*-1/ - depends_on: - - "sign-source-packages-built-from-static-binaries" - commands: - - eval "$SET_VERSION" - - mkdir -p srcs - - buildkite-agent artifact download "epel/*" srcs --step sign-source-packages-built-from-static-binaries - - nix develop .#buildkite -c ./docker/build/fedora/upload.py -d srcs/epel --upload epel - - - label: Build Big Sur x86_64 bottles - key: build-bottles-big-sur-x86_64 - if: build.tag =~ /^v.*/ - agents: - queue: "x86_64-rosetta-darwin" - commands: - - nix develop .#autorelease-macos -c ./scripts/build-all-bottles.sh "big_sur" - artifact_paths: - - '*.bottle.*' - retry: - automatic: - limit: 1 - - - label: Build Big Sur arm64 bottles - key: build-bottles-big-sur-arm64 - if: build.tag =~ /^v.*/ - agents: - queue: "arm64-darwin" - commands: - - nix develop .#autorelease-macos -c ./scripts/build-all-bottles.sh "arm64_big_sur" - artifact_paths: - - '*.bottle.*' - retry: - automatic: - limit: 1 - - # We use the tag that triggered the pipeline here. - # However, this requires that the tag and the release name are the same, which - # in practice it's always the case in this repo. - - label: Add Big Sur bottle hashes to formulae - depends_on: - - "build-bottles-big-sur-arm64" - - "build-bottles-big-sur-x86_64" - if: build.tag =~ /^v.*/ - commands: - - mkdir -p "Big Sur" - - nix develop .#buildkite -c gh release download "$BUILDKITE_TAG" -D "Big Sur/" -p "*big_sur.bottle.tar.gz" - - nix develop .#autorelease -c ./scripts/sync-bottle-hashes.sh "$BUILDKITE_TAG" "Big Sur" - label: Update binaries list depends_on: - "build-via-docker" - - "add-bigsur-hashes" - if: build.tag =~ /^v.*-1/ + # - "add-bigsur-hashes" + if: build.tag == "test-736" key: update-binaries commands: - buildkite-agent artifact download tmp/binaries.txt docker --step "build-via-docker" diff --git a/.buildkite/retag.sh b/.buildkite/retag.sh new file mode 100755 index 000000000..0b65dbb61 --- /dev/null +++ b/.buildkite/retag.sh @@ -0,0 +1,4 @@ +git tag -d test-736 +git push --delete origin test-736 +git tag -a test-736 -m "Test" +git push origin test-736 \ No newline at end of file diff --git a/.github/binaries_update_pr.md b/.github/binaries_update_pr.md new file mode 100644 index 000000000..5183c8561 --- /dev/null +++ b/.github/binaries_update_pr.md @@ -0,0 +1,14 @@ +## Description + +This is automatically created PR to update list of supported binaries after recent release. + +#### Related changes (conditional) + +- [ ] I checked whether I should update the [README](/serokell/tezos-packaging/tree/master/README.md) + +- [ ] I checked whether native packaging works, i.e. native binary packages + can be successfully built. + +#### Stylistic guide (mandatory) + +- [ ] My commits comply with [the policy used in Serokell](https://www.notion.so/serokell/Where-and-how-to-commit-your-work-58f8973a4b3142c8abbd2e6fd5b3a08e). diff --git a/docker/docker-static-build.sh b/docker/docker-static-build.sh index 337028ea8..2cddcd93a 100755 --- a/docker/docker-static-build.sh +++ b/docker/docker-static-build.sh @@ -53,4 +53,6 @@ for b in "${binaries[@]}"; do "$virtualisation_engine" cp "$container_id:/tezos/$b" "$b" done printf "%s\n" "${binaries[@]}" > "/tmp/binaries.txt" +echo "${binaries[@]}" +echo "$(ls /tmp | grep binaries.txt)" "$virtualisation_engine" rm -v "$container_id" diff --git a/docker/package/scripts/update-binaries-list.py b/docker/package/scripts/update-binaries-list.py index 755ab91e0..64c4f86e8 100644 --- a/docker/package/scripts/update-binaries-list.py +++ b/docker/package/scripts/update-binaries-list.py @@ -22,7 +22,7 @@ def main(): binaries_list_path = os.environ["PWD"] + binaries_list_path_suffix with open(binaries_list_path, 'r') as f: binaries = [l.strip() for l in f.readlines()] - + print(binaries) if not binaries: raise Exception('Exception, while reading binaries list: binaries list is empty') diff --git a/docker/update-binaries.sh b/docker/update-binaries.sh index 4521b45a4..c37154cae 100644 --- a/docker/update-binaries.sh +++ b/docker/update-binaries.sh @@ -15,5 +15,5 @@ python3 package/scripts/update-binaries-list.py git add --all git commit -m "Updated binaries for $BUILDKITE_TAG release" --gpg-sign="tezos-packaging@serokell.io" -git push --set-upstream origin "$branch" --force-with-lease -gh pr create -B master -t "Update list of binaries for $BUILDKITE_TAG" -F ../.github/binaries_update_pr.md +git push --set-upstream origin "$branch" +gh pr create -B master -t "Update list of binaries for $BUILDKITE_TAG" -b "Updated list of binaries for $BUILDKITE_TAG version"