Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix types action (test) #879

Merged
merged 8 commits into from
Nov 27, 2024
Merged

fix types action (test) #879

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
296ced3
test
0xDEnYO Nov 27, 2024
3e989bc
action should fail if latest tag cannot be retrieved
0xDEnYO Nov 27, 2024
f4f597a
minor fix
0xDEnYO Nov 27, 2024
465766a
Merge branch 'main' into fixTypesAction#5
0xDEnYO Nov 27, 2024
34fbaed
minor fix#2
0xDEnYO Nov 27, 2024
70630ac
Merge branch 'fixTypesAction#5' of github.com:lifinance/contracts int…
0xDEnYO Nov 27, 2024
185d731
update regex
0xDEnYO Nov 27, 2024
067252e
bugfix
0xDEnYO Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 100 additions & 45 deletions .github/workflows/types.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,111 +10,166 @@ jobs:
generate-tag:
runs-on: ubuntu-latest
permissions:
contents: read
contents: write # Needed to push new tags

steps:
- name: Checkout contracts repository
uses: actions/checkout@v4
# Step 1: Checkout the contracts repository
- name: Checkout Contracts Repository
uses: actions/[email protected]
with:
ref: ${{ env.BRANCH_NAME }}

# Step 2: Install Foundry
- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Install Solidity Libs
# Step 3: Install Solidity Libraries
- name: Install Solidity Libraries
run: forge install

# Step 4: Setup Node.js
- name: Setup Node.js
uses: actions/[email protected]
with:
node-version: 20

- name: Install Node deps
# Step 5: Install Node.js dependencies
- name: Install Node Dependencies
run: yarn install

# Step 6: Generate ABI from contracts
- name: Generate ABI
run: yarn abi:generate

- name: Generate types bindings
# Step 7: Generate TypeScript bindings from ABI
- name: Generate TypeScript Bindings
run: yarn typechain

- name: Checkout lifi-contract-types repository
uses: actions/checkout@v4
# Step 8: Checkout the lifi-contract-types repository
- name: Checkout lifi-contract-types Repository
uses: actions/[email protected]
with:
repository: lifinance/lifi-contract-types
path: lifi-contract-types
ssh-key: ${{ secrets.SSH_REPO_TOKEN }}
ref: main

- name: Copy types bindings
# Step 9: Copy generated types and ABI into the lifi-contract-types repo
- name: Copy Type Bindings and ABI
run: |
rm -r lifi-contract-types/src/
mv typechain lifi-contract-types/src
cp diamond.json lifi-contract-types/dist/
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved

- name: Build contract types
# Step 10: Build the lifi-contract-types project
- name: Build Contract Types
run: cd lifi-contract-types && yarn install && yarn build

- name: Retrieve latest Tag
# Step 11: Retrieve the latest tag from the repository
- name: Retrieve Latest Tag
id: latest_release
run: |
# fetch tag releases
release_json=$(curl https://api.github.com/repos/lifinance/lifi-contract-types/tags)
# Fetch tags from the lifi-contract-types repository
RELEASE_JSON=$(curl https://api.github.com/repos/lifinance/lifi-contract-types/tags)

# get the latest tag
LATEST_TAG=$(echo "$release_json" | jq -r '.[0].name')
# Extract the latest tag name
LATEST_TAG=$(echo "$RELEASE_JSON" | jq -r '.[0].name')

# we need to make sure that on staging we're going to update a -beta version, if any
# Handle beta versions for non-main branches
if [[ "$BRANCH_NAME" != "main" ]]; then
# if it has already "-beta", no other action is required, since it means
# that we're already going to update the latest staging release
if [[ "$LATEST_TAG" != *"beta"* ]]; then
# otherwise, start looping through the tags and search for the latest -beta tag
while read item; do
tag_name=$(jq -r '.name' <<< "$item")
# check if there's already a latest tag beta release
# and, if present, use it instead of the main one
# if we end up without any latest beta tag, we will create a beta release from the latest tag
if [[ "$tag_name" == "$LATEST_TAG-$beta"* ]]; then
LATEST_TAG=$tag_name
while read ITEM; do
TAG_NAME=$(jq -r '.name' <<< "$ITEM")
if [[ "$TAG_NAME" == "$LATEST_TAG-$beta"* ]]; then
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
LATEST_TAG=$TAG_NAME
break
fi
done <<<$(echo "$release_json" | jq -c -r '.[]')
done <<<$(echo "$RELEASE_JSON" | jq -c -r '.[]')
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
fi
fi
echo "latest tag: $LATEST_TAG"
echo "LATEST_TAG=${LATEST_TAG}" >> $GITHUB_ENV

- name: Update version
# Check if LATEST_TAG is empty or null
if [[ -z "$LATEST_TAG" || "$LATEST_TAG" == "null" ]]; then
echo "ERROR: No latest tag found in the repository."
exit 1
fi

# Validate semver format
if [[ ! "$LATEST_TAG" =~ ^[0-9]+\.[0-9]+\.[0-9]+(-beta)?$ ]]; then
echo "ERROR: Invalid version format: $LATEST_TAG (not a valid semver format)"
exit 1
fi

echo "LATEST_TAG=$LATEST_TAG"
echo "LATEST_TAG=$LATEST_TAG" >> $GITHUB_ENV

# Step 12: Increment the version number based on the commit message and branch
- name: Update Version
if: ${{ success() }}
env:
LATEST_TAG: ${{ env.LATEST_TAG }}
BRANCH_NAME: ${{ env.BRANCH_NAME }}
MESSAGE: ${{ github.event.head_commit.message }}
id: bump_version
uses: christian-draeger/[email protected]
with:
current-version: '${{ env.LATEST_TAG }}'
version-fragment: "${{ env.BRANCH_NAME == 'main' && (contains(env.MESSAGE, 'major') && 'major' || contains(env.MESSAGE, 'feat') && 'feature' || 'bug') || 'beta' }}"
run: |
VERSION_FRAGMENT=""

- name: Push tag
# Determine the type of version bump
if [[ "$BRANCH_NAME" == "main" ]]; then
if [[ "$MESSAGE" =~ "major" ]]; then
VERSION_FRAGMENT="major"
elif [[ "$MESSAGE" =~ "feat" ]]; then
VERSION_FRAGMENT="minor"
else
VERSION_FRAGMENT="patch"
fi
else
VERSION_FRAGMENT="beta"
fi

# Parse and increment the version
IFS='.' read -r MAJOR MINOR PATCH <<< "${CURRENT_VERSION//[^0-9.]/}"
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved

if [[ "$VERSION_FRAGMENT" == "major" ]]; then
MAJOR=$((MAJOR + 1))
MINOR=0
PATCH=0
elif [[ "$VERSION_FRAGMENT" == "minor" ]]; then
MINOR=$((MINOR + 1))
PATCH=0
elif [[ "$VERSION_FRAGMENT" == "patch" ]]; then
PATCH=$((PATCH + 1))
elif [[ "$VERSION_FRAGMENT" == "beta" ]]; then
PATCH=$((PATCH + 1))
NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}-beta"
else
NEW_VERSION="${MAJOR}.${MINOR}.${PATCH}"
fi
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved

echo "NEW_VERSION=$NEW_VERSION" >> $GITHUB_ENV

# Step 13: Push the updated version tag to the repository
- name: Push Updated Tag
if: ${{ success() }}
env:
NEW_VERSION: ${{ env.NEW_VERSION }}
BRANCH_NAME: ${{ env.BRANCH_NAME }}
MESSAGE: ${{ github.event.head_commit.message }}
if: steps.bump_version.outputs.next-version
run: |
cd lifi-contract-types
tmp=$(mktemp)
jq '.version="${{ steps.bump_version.outputs.next-version }}"' package.json > "$tmp" && mv "$tmp" package.json
TMP=$(mktemp)
jq '.version="${NEW_VERSION}"' package.json > "$TMP" && mv "$TMP" package.json
git config user.name github-actions
git config user.email [email protected]
echo 'Updating version from ${{ env.LATEST_TAG }} to ${{ steps.bump_version.outputs.next-version }}'
echo "Updating version from $LATEST_TAG to $NEW_VERSION"
git add src/*
git add dist/*
git add package.json
git commit -m 'actions: new contracts version ${{ steps.bump_version.outputs.next-version }}'

# Sanitize the commit message by removing single quotes
COMMIT_MSG=$(echo "$MESSAGE" | sed "s/'//g")
git commit -m "actions: new contracts version $NEW_VERSION"

git tag -a v${{ steps.bump_version.outputs.next-version }} -m "$MESSAGE"
git push origin tag v${{ steps.bump_version.outputs.next-version }}
# Annotate and push the new tag
git tag -a "v$NEW_VERSION" -m "$MESSAGE"
git push origin tag "v$NEW_VERSION"
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
if [[ "$BRANCH_NAME" == "main" ]]; then
git push -u origin $BRANCH_NAME
fi
120 changes: 120 additions & 0 deletions .github/workflows_deactivated/types.oldVersion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
name: Types Bindings

on:
push:

env:
BRANCH_NAME: ${{ github.head_ref || github.ref_name }}

jobs:
generate-tag:
runs-on: ubuntu-latest
permissions:
contents: read

0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
steps:
- name: Checkout contracts repository
uses: actions/checkout@v4
with:
ref: ${{ env.BRANCH_NAME }}

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- name: Install Solidity Libs
run: forge install

- name: Setup Node.js
uses: actions/[email protected]
with:
node-version: 20

- name: Install Node deps
run: yarn install

- name: Generate ABI
run: yarn abi:generate

- name: Generate types bindings
run: yarn typechain

- name: Checkout lifi-contract-types repository
uses: actions/checkout@v4
with:
repository: lifinance/lifi-contract-types
path: lifi-contract-types
ssh-key: ${{ secrets.SSH_REPO_TOKEN }}
ref: main

- name: Copy types bindings
run: |
rm -r lifi-contract-types/src/
mv typechain lifi-contract-types/src
cp diamond.json lifi-contract-types/dist/

- name: Build contract types
run: cd lifi-contract-types && yarn install && yarn build

- name: Retrieve latest Tag
id: latest_release
run: |
# fetch tag releases
release_json=$(curl https://api.github.com/repos/lifinance/lifi-contract-types/tags)

# get the latest tag
LATEST_TAG=$(echo "$release_json" | jq -r '.[0].name')

# we need to make sure that on staging we're going to update a -beta version, if any
if [[ "$BRANCH_NAME" != "main" ]]; then
# if it has already "-beta", no other action is required, since it means
# that we're already going to update the latest staging release
if [[ "$LATEST_TAG" != *"beta"* ]]; then
# otherwise, start looping through the tags and search for the latest -beta tag
while read item; do
tag_name=$(jq -r '.name' <<< "$item")
# check if there's already a latest tag beta release
# and, if present, use it instead of the main one
# if we end up without any latest beta tag, we will create a beta release from the latest tag
if [[ "$tag_name" == "$LATEST_TAG-$beta"* ]]; then
LATEST_TAG=$tag_name
break
fi
done <<<$(echo "$release_json" | jq -c -r '.[]')
fi
fi
echo "latest tag: $LATEST_TAG"
echo "LATEST_TAG=${LATEST_TAG}" >> $GITHUB_ENV

0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
- name: Update version
env:
MESSAGE: ${{ github.event.head_commit.message }}
id: bump_version
uses: christian-draeger/[email protected]
with:
current-version: '${{ env.LATEST_TAG }}'
version-fragment: "${{ env.BRANCH_NAME == 'main' && (contains(env.MESSAGE, 'major') && 'major' || contains(env.MESSAGE, 'feat') && 'feature' || 'bug') || 'beta' }}"

0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
- name: Push tag
env:
MESSAGE: ${{ github.event.head_commit.message }}
if: steps.bump_version.outputs.next-version
run: |
cd lifi-contract-types
tmp=$(mktemp)
jq '.version="${{ steps.bump_version.outputs.next-version }}"' package.json > "$tmp" && mv "$tmp" package.json
git config user.name github-actions
git config user.email [email protected]
echo 'Updating version from ${{ env.LATEST_TAG }} to ${{ steps.bump_version.outputs.next-version }}'
git add src/*
git add dist/*
git add package.json
git commit -m 'actions: new contracts version ${{ steps.bump_version.outputs.next-version }}'

# Sanitize the commit message by removing single quotes
COMMIT_MSG=$(echo "$MESSAGE" | sed "s/'//g")

git tag -a v${{ steps.bump_version.outputs.next-version }} -m "$MESSAGE"
git push origin tag v${{ steps.bump_version.outputs.next-version }}
if [[ "$BRANCH_NAME" == "main" ]]; then
git push -u origin $BRANCH_NAME
fi
0xDEnYO marked this conversation as resolved.
Show resolved Hide resolved
Loading