Merge pull request #37 from blukat29/update-cicd-20240703

ci: Fix release-PR flow

.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
+      - rpc-tester-report

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

release_rc.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Fetch tags from upstream first
-git fetch -t [email protected]:klaytn/klaytn.git
+git fetch -t [email protected]:kaiachain/kaia.git
 
 VERSION=$(go run build/rpm/main.go version)
 echo "Trying to tag $VERSION"