fix: agoric tag regex

p2p-org · Feb 15, 2025 · 5e3d140 · 5e3d140
1 parent f2827c8
commit 5e3d140
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 23 deletions.
diff --git a/.github/workflows/agoric.yaml b/.github/workflows/agoric.yaml
@@ -3,7 +3,7 @@ name: Build and Push agoric Docker Image
 on:
   push:
     tags:
-      - "agoric-upgrade-[0-9]+*"
+      - "agoric-upgrade-*"
   workflow_dispatch:
 
 env:
@@ -42,30 +42,16 @@ jobs:
         id: extract_version
         run: echo "VERSION=${GITHUB_REF#refs/tags/}" >> $GITHUB_ENV
 
-      - name: Checkout agorik-sdk repository
-        uses: actions/checkout@v4
-        with:
-          repository: agoric/agoric-sdk
-          ref: ${{ env.VERSION }}
-          fetch-tags: true
-          path: agoric-sdk
-
-      - name: Extract SDK version    
-        run: |
-          cd agoric-sdk
-          echo "SDK_VERSION=$(git tag --points-at HEAD | grep sdk | awk -F@ {'print $3'})" >> $GITHUB_ENV
-          cd ..
-
       - name: Manually pull the base Docker image
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u ${{ github.actor }} --password-stdin
           docker pull ghcr.io/p2p-org/cosmos-heighliner:infra-toolkit-${{ env.INFRA_TOOLKIT }}
 
       - name: Build and push agoric Docker image
         run: |
-          ./heighliner build -c agoric-imported --git-ref ${{ env.SDK_VERSION }}
+          ./heighliner build -c agoric --git-ref ${{ env.VERSION }}
 
       - name: Tag and push Docker image
         run: |
-          docker tag agoric-imported:${{ env.SDK_VERSION }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
+          docker tag agoric:${{ env.VERSION }} ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
           docker push ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ env.VERSION }}
diff --git a/chains.yaml b/chains.yaml
@@ -25,12 +25,12 @@
   github-repo: agoric-sdk
   build-env:
     - LEDGER_ENABLED=false
+    - GO_VERSION=1.21
+    - PATH=/usr/local/go/bin:$PATH
   build-target: |
-    apt update && apt install -y python3 g++
-
     curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.3/install.sh | bash
     export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
-    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+    [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
     nvm install 18
     npm i -g yarn
 
@@ -47,6 +47,10 @@
     # Build daemon lib
     go build -v -mod=readonly -tags "$BUILD_TAGS" -ldflags "$COMMON_LDFLAGS" -buildmode=c-shared -o build/libagcosmosdaemon.so ./cmd/libdaemon/main.go
 
+    # Build helper
+    LDFLAGS_HELPER="$COMMON_LDFLAGS -X github.com/cosmos/cosmos-sdk/version.AppName=ag-cosmos-helper"
+    go build -v -mod=readonly -tags "$BUILD_TAGS" -ldflags "$LDFLAGS_HELPER" -o ../../bin/ag-cosmos-helper ./cmd/helper
+
     # Build agd
     go build -v -mod=readonly -tags "$BUILD_TAGS" -ldflags "$COMMON_LDFLAGS" -o ../../bin/agd ./cmd/agd
 
@@ -79,11 +83,12 @@
   final-image: |
     set -eux
     ln -s /agoric-sdk/bin/agd /bin/agd
+    ln -s /agoric-sdk/bin/ag-cosmos-helper /bin/ag-cosmos-helper
     ln -s /agoric-sdk/packages/cosmic-swingset/bin/ag-chain-cosmos /bin/ag-chain-cosmos
     ln -s /agoric-sdk/packages/cosmic-swingset/bin/ag-nchainz /bin/ag-nchainz
-    mkdir -p /go/src/github.com/p2p-org/agoric-sdk/golang/cosmos/build /build/agoric-sdk/golang/cosmos/build
-    mv /agoric-sdk/golang/cosmos/build/libagcosmosdaemon.so /go/src/github.com/p2p-org/agoric-sdk/golang/cosmos/build/
-    ln -s  /go/src/github.com/p2p-org/agoric-sdk/golang/cosmos/build/libagcosmosdaemon.so /build/agoric-sdk/golang/cosmos/build/libagcosmosdaemon.so
+    mkdir -p /go/src/github.com/strangelove-ventures/agoric-sdk/golang/cosmos/build /build/agoric-sdk/golang/cosmos/build
+    mv /agoric-sdk/golang/cosmos/build/libagcosmosdaemon.so /go/src/github.com/strangelove-ventures/agoric-sdk/golang/cosmos/build/
+    ln -s  /go/src/github.com/strangelove-ventures/agoric-sdk/golang/cosmos/build/libagcosmosdaemon.so /build/agoric-sdk/golang/cosmos/build/libagcosmosdaemon.so
     ln -s /root/.nvm/versions/node/*/bin/node /bin/node
 
 # Agoric-sdk