update workflow to sync versioning

delvtech · Apr 29, 2024 · 35aabef · 35aabef
1 parent 14fb186
commit 35aabef
Show file tree

Hide file tree

Showing 6 changed files with 112 additions and 25 deletions.
diff --git a/.github/workflows/build_wasm.yml b/.github/workflows/build_wasm.yml
@@ -50,12 +50,20 @@ jobs:
         with:
           version: nightly
 
+      - name: Check out hyperdrive-rs
+        uses: actions/checkout@v4
+        with:
+          repository: delvtech/hyperdrive-rs
+          ref: "v0.1.0"
+          path: "./hyperdrive-rs"
+
       - name: check out hyperdrive
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
         with:
           repository: delvtech/hyperdrive
           ref: "v1.0.3"
-          path: "./hyperdrive"
+          path: "./hyperdrive-rs/hyperdrive"
+          ssh-key: ${{ secrets.HYPERDRIVE_ACCESS_KEY }}
 
       - name: build hyperdrive-wasm
         working-directory: crates/hyperdrive-wasm

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
@@ -22,7 +22,8 @@ jobs:
     name: build on linux
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout hyperdrive-bindings
+        uses: actions/checkout@v4
         with:
           token: ${{github.token}}
 
@@ -46,19 +47,33 @@ jobs:
       - name: set up pip
         run: python -m pip install --upgrade pip
 
-      - name: check out hyperdrive-rs
+      - name: Fetch latest release tag from hyperdrive
+        run: ./scripts/fetch-latest-tag.sh delvtech hyperdrive
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Fetch latest release tag from hyperdrive-rs
+        run: ./scripts/fetch-latest-tag.sh delvtech hyperdrive-rs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check out hyperdrive-rs
         uses: actions/checkout@v4
         with:
           repository: delvtech/hyperdrive-rs
-          ref: "v1.0.1"
+          ref: ${{ env.latest_tag_hyperdrive-rs }}
           path: "./hyperdrive-rs"
 
       - name: check out hyperdrive
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
         with:
           repository: delvtech/hyperdrive
-          ref: "v1.0.3"
+          ref: ${{ env.latest_tag_hyperdrive }}
           path: "./hyperdrive-rs/hyperdrive"
+          ssh-key: ${{ secrets.HYPERDRIVE_ACCESS_KEY }}
+
+      - name: build hyperdrive
+        run: cd hyperdrive-rs/hyperdrive && make build-sol
 
       - name: build hyperdrivepy
         shell: bash
@@ -83,19 +98,40 @@ jobs:
         python-version: [cp310]
 
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout hyperdrive-bindings
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Fetch latest release tag from hyperdrive
+        run: ./scripts/fetch-latest-tag.sh delvtech hyperdrive
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Fetch latest release tag from hyperdrive-rs
+        run: ./scripts/fetch-latest-tag.sh delvtech hyperdrive-rs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check out hyperdrive-rs
+        uses: actions/checkout@v4
+        with:
+          repository: delvtech/hyperdrive-rs
+          ref: ${{ env.latest_tag_hyperdrive-rs }}
+          path: "./hyperdrive-rs"
+
       - name: check out hyperdrive
-        uses: actions/checkout@master
+        uses: actions/checkout@v4
         with:
           repository: delvtech/hyperdrive
-          ref: "v1.0.3"
-          path: "./hyperdrive"
+          ref: ${{ env.latest_tag_hyperdrive }}
+          path: "./hyperdrive-rs/hyperdrive"
           ssh-key: ${{ secrets.HYPERDRIVE_ACCESS_KEY }}
 
+      - name: build hyperdrive
+        run: cd hyperdrive-rs/hyperdrive && make build-sol
+
       - name: set up python
         uses: actions/setup-python@v4
         with:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -25,29 +25,40 @@ jobs:
     name: python lint
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - name: Checkout hyperdrive-bindings
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           token: ${{ secrets.GITHUB_TOKEN }}
 
       # NOTE: This is needed to ensure that hyperdrive-wrappers builds correctly.
-      - name: install foundry
+      - name: Install foundry
         uses: foundry-rs/foundry-toolchain@v1
         with:
           version: nightly
 
-      - name: check out hyperdrive-rs
+      - name: Fetch latest release tag from hyperdrive
+        run: ./scripts/fetch-latest-tag.sh delvtech hyperdrive
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Fetch latest release tag from hyperdrive-rs
+        run: ./scripts/fetch-latest-tag.sh delvtech hyperdrive-rs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check out hyperdrive-rs
         uses: actions/checkout@v4
         with:
           repository: delvtech/hyperdrive-rs
-          ref: "v1.0.3"
+          ref: ${{ env.latest_tag_hyperdrive-rs }}
           path: "./hyperdrive-rs"
 
       - name: check out hyperdrive
         uses: actions/checkout@v4
         with:
           repository: delvtech/hyperdrive
-          ref: "v1.0.3"
+          ref: ${{ env.latest_tag_hyperdrive }}
           path: "./hyperdrive-rs/hyperdrive"
           ssh-key: ${{ secrets.HYPERDRIVE_ACCESS_KEY }}
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,19 +36,30 @@ jobs:
         with:
           version: nightly
 
-      - name: check out hyperdrive-rs
-        uses: actions/checkout@v3
+      - name: Fetch latest release tag from hyperdrive
+        run: ./scripts/fetch-latest-tag.sh delvtech hyperdrive
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Fetch latest release tag from hyperdrive-rs
+        run: ./scripts/fetch-latest-tag.sh delvtech hyperdrive-rs
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check out hyperdrive-rs
+        uses: actions/checkout@v4
         with:
           repository: delvtech/hyperdrive-rs
-          ref: "v1.0.3"
+          ref: ${{ env.latest_tag_hyperdrive-rs }}
           path: "./hyperdrive-rs"
 
       - name: check out hyperdrive
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: delvtech/hyperdrive
-          ref: "v1.0.3"
+          ref: ${{ env.latest_tag_hyperdrive }}
           path: "./hyperdrive-rs/hyperdrive"
+          ssh-key: ${{ secrets.HYPERDRIVE_ACCESS_KEY }}
 
       - name: build hyperdrive
         run: cd hyperdrive-rs/hyperdrive && make build-sol

diff --git a/crates/hyperdrive-wasm/Cargo.toml b/crates/hyperdrive-wasm/Cargo.toml
@@ -21,10 +21,10 @@ wasm-bindgen-futures = "0.4.36"
 wasm-bindgen = { version = "0.2.86", features = ["serde-serialize"] }
 hex = { package = "const-hex", version = "1.6", features = ["hex"] }
 
-fixed-point = { version = "0.1.0", path = "../../hyperdrive/crates/fixed-point" }
-fixed-point-macros = { version = "0.1.0", path = "../../hyperdrive/crates/fixed-point-macros" }
-hyperdrive-math = { version = "0.1.0", path = "../../hyperdrive/crates/hyperdrive-math" }
-hyperdrive-wrappers = { version = "0.1.0", path = "../../hyperdrive/crates/hyperdrive-wrappers" }
+fixed-point = { version = "0.1.0", path = "../../hyperdrive-rs/hyperdrive/crates/fixed-point" }
+fixed-point-macros = { version = "0.1.0", path = "../../hyperdrive-rs/hyperdrive/crates/fixed-point-macros" }
+hyperdrive-math = { version = "0.1.0", path = "../../hyperdrive-rs/hyperdrive/crates/hyperdrive-math" }
+hyperdrive-wrappers = { version = "0.1.0", path = "../../hyperdrive-rs/hyperdrive/crates/hyperdrive-wrappers" }
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires

diff --git a/scripts/fetch-latest-tag.sh b/scripts/fetch-latest-tag.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+# GitHub organization
+ORG=$1
+
+# GitHub repository name
+REPO=$2
+
+# GitHub Token provided by GitHub Actions
+TOKEN=${GITHUB_TOKEN}
+
+# Fetch all tags from the repository
+TAG=$(curl -sH "Authorization: token $TOKEN" "https://api.github.com/repos/$ORG/$REPO/releases/latest" | jq -r '.tag_name')
+
+# Sanitize repository name to create a valid environment variable name
+# Replace '/' with '_' and convert to lower case
+ENV_REPO_NAME=$(echo "$REPO" | tr '/' '_' | tr '[:upper:]' '[:lower:]')
+
+# Output the tag for subsequent steps
+# echo "latest_tag_${ENV_REPO_NAME}=$TAG" >> $GITHUB_ENV
+echo "latest_tag_${ENV_REPO_NAME}=$TAG"