From 4ba2df63a0755033c948ae0fb160547004ac2cc0 Mon Sep 17 00:00:00 2001 From: "ollie.j" Date: Wed, 3 Jul 2024 19:36:20 +0900 Subject: [PATCH 1/3] ci: Update release_rc.sh --- release_rc.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/release_rc.sh b/release_rc.sh index b1166cede..00d01b106 100755 --- a/release_rc.sh +++ b/release_rc.sh @@ -1,7 +1,7 @@ #!/bin/bash # Fetch tags from upstream first -git fetch -t git@github.com:klaytn/klaytn.git +git fetch -t git@github.com:kaiachain/kaia.git VERSION=$(go run build/rpm/main.go version) echo "Trying to tag $VERSION" From 10f13884d320b158cc076c18a8b49bfdafe26d5f Mon Sep 17 00:00:00 2001 From: "ollie.j" Date: Wed, 3 Jul 2024 19:37:42 +0900 Subject: [PATCH 2/3] ci: Remove packaging-darwin jobs --- .circleci/config.yml | 53 +------------------------------------------- 1 file changed, 1 insertion(+), 52 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 0aecdc465..d018cb7cf 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -57,11 +57,6 @@ executors: KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP: CONTROLLER:PLAINTEXT,PLAINTEXT:PLAINTEXT KAFKA_CFG_CONTROLLER_LISTENER_NAMES: CONTROLLER KAFKA_CFG_INTER_BROKER_LISTENER_NAME: PLAINTEXT - darwin-executor: # this executor is for packaging darwin binaries - working_directory: ~/go/src/github.com/kaiachain/kaia - macos: - xcode: 14.2.0 - resource_class: macos.x86.medium.gen2 rpm-executor: # this executor is for packaging rpm binaries working_directory: /go/src/github.com/kaiachain/kaia docker: @@ -75,18 +70,6 @@ executors: - image: cimg/go:1.22.1 commands: - install-darwin-dependencies: - description: Install dependencies on darwin machine - steps: - - run: - name: "install darwin dependencies" - command: | - # install awscli - brew install awscli - # install golang - curl -O https://dl.google.com/go/go1.22.1.darwin-amd64.tar.gz - mkdir $HOME/go1.22.1 - tar -C $HOME/go1.22.1 -xzf go1.22.1.darwin-amd64.tar.gz pre-build: description: "before build, set version" steps: @@ -488,28 +471,6 @@ jobs: - upload-repo: item: "kcn kpn ken" - packaging-darwin: - executor: darwin-executor - steps: - - checkout - - install-darwin-dependencies - - pre-build - - build-packaging: - os-network: "darwin-amd64" - - upload-repo - - packaging-darwin-baobab: - executor: darwin-executor - steps: - - checkout - - install-darwin-dependencies - - pre-build - - build-packaging: - os-network: "darwin-amd64" - baobab: "-b" - - upload-repo: - item: "kcn kpn ken" - rpm-tagged: executor: rpm-executor steps: @@ -632,8 +593,6 @@ workflows: - rpm-tagged-baobab - packaging-linux - packaging-linux-baobab - - packaging-darwin - - packaging-darwin-baobab filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]/ @@ -646,8 +605,6 @@ workflows: - rpm-tagged-baobab - packaging-linux - packaging-linux-baobab - - packaging-darwin - - packaging-darwin-baobab filters: tags: only: /^v[0-9]+\.[0-9]+\.[0-9]+-rc\.[0-9]+.*/ @@ -670,14 +627,6 @@ workflows: filters: *filter-only-version-tag requires: - pass-tests - - packaging-darwin: - filters: *filter-only-version-tag - requires: - - pass-tests - - packaging-darwin-baobab: - filters: *filter-only-version-tag - requires: - - pass-tests - major-tagging: filters: @@ -712,4 +661,4 @@ workflows: branches: only: dev jobs: - - rpc-tester-report \ No newline at end of file + - rpc-tester-report From 6184ce3fc945b713cf7dd56eba10451fa91dcc3d Mon Sep 17 00:00:00 2001 From: "ollie.j" Date: Wed, 3 Jul 2024 20:00:36 +0900 Subject: [PATCH 3/3] build: Rename testnet conf files to TARGETd_kairos.conf --- build/package-tar.sh | 2 +- .../packaging/linux/conf/{kcnd_baobab.conf => kcnd_kairos.conf} | 0 .../packaging/linux/conf/{kend_baobab.conf => kend_kairos.conf} | 0 .../packaging/linux/conf/{kpnd_baobab.conf => kpnd_kairos.conf} | 0 build/rpm/etc/kcnd/conf/{kcnd_baobab.conf => kcnd_kairos.conf} | 0 build/rpm/etc/kend/conf/{kend_baobab.conf => kend_kairos.conf} | 0 build/rpm/etc/kpnd/conf/{kpnd_baobab.conf => kpnd_kairos.conf} | 0 7 files changed, 1 insertion(+), 1 deletion(-) rename build/packaging/linux/conf/{kcnd_baobab.conf => kcnd_kairos.conf} (100%) rename build/packaging/linux/conf/{kend_baobab.conf => kend_kairos.conf} (100%) rename build/packaging/linux/conf/{kpnd_baobab.conf => kpnd_kairos.conf} (100%) rename build/rpm/etc/kcnd/conf/{kcnd_baobab.conf => kcnd_kairos.conf} (100%) rename build/rpm/etc/kend/conf/{kend_baobab.conf => kend_kairos.conf} (100%) rename build/rpm/etc/kpnd/conf/{kpnd_baobab.conf => kpnd_kairos.conf} (100%) diff --git a/build/package-tar.sh b/build/package-tar.sh index dc98a9ade..ff66c8703 100755 --- a/build/package-tar.sh +++ b/build/package-tar.sh @@ -113,7 +113,7 @@ if [ ! -z "$DAEMON" ]; then mkdir -p ${PACK_NAME}/conf CONF_FILE=build/packaging/linux/conf/${TARGET}d.conf if [ ! -z "$TESTNET" ]; then - TESTNET_CONF_FILE=build/packaging/linux/conf/${TARGET}d_baobab.conf # TODO: rename to _kairos + TESTNET_CONF_FILE=build/packaging/linux/conf/${TARGET}d_kairos.conf if [ -e "$TESTNET_CONF_FILE" ]; then CONF_FILE=$TESTNET_CONF_FILE else diff --git a/build/packaging/linux/conf/kcnd_baobab.conf b/build/packaging/linux/conf/kcnd_kairos.conf similarity index 100% rename from build/packaging/linux/conf/kcnd_baobab.conf rename to build/packaging/linux/conf/kcnd_kairos.conf diff --git a/build/packaging/linux/conf/kend_baobab.conf b/build/packaging/linux/conf/kend_kairos.conf similarity index 100% rename from build/packaging/linux/conf/kend_baobab.conf rename to build/packaging/linux/conf/kend_kairos.conf diff --git a/build/packaging/linux/conf/kpnd_baobab.conf b/build/packaging/linux/conf/kpnd_kairos.conf similarity index 100% rename from build/packaging/linux/conf/kpnd_baobab.conf rename to build/packaging/linux/conf/kpnd_kairos.conf diff --git a/build/rpm/etc/kcnd/conf/kcnd_baobab.conf b/build/rpm/etc/kcnd/conf/kcnd_kairos.conf similarity index 100% rename from build/rpm/etc/kcnd/conf/kcnd_baobab.conf rename to build/rpm/etc/kcnd/conf/kcnd_kairos.conf diff --git a/build/rpm/etc/kend/conf/kend_baobab.conf b/build/rpm/etc/kend/conf/kend_kairos.conf similarity index 100% rename from build/rpm/etc/kend/conf/kend_baobab.conf rename to build/rpm/etc/kend/conf/kend_kairos.conf diff --git a/build/rpm/etc/kpnd/conf/kpnd_baobab.conf b/build/rpm/etc/kpnd/conf/kpnd_kairos.conf similarity index 100% rename from build/rpm/etc/kpnd/conf/kpnd_baobab.conf rename to build/rpm/etc/kpnd/conf/kpnd_kairos.conf