Skip to content

Auto-rebase: next onto latest develop #1497

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.

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

Open
wants to merge 34 commits into
base: next
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
edd8dca
docs: ✏️ doc fix to exclude scripts from typedoc scripts
F-OBrien Apr 4, 2025
0a846d0
fix: 🐛 Correct validation for NFT collection ownership transfer
prashantasdeveloper Apr 23, 2025
e62cfb5
chore: 🤖 update release-config for develop
prashantasdeveloper Mar 27, 2025
36780a0
chore: 🤖 add GA to prevent merging breaking changes in develop
prashantasdeveloper Mar 31, 2025
4ba1cdc
chore: 🤖 add ts-morph to check for breaking changes
prashantasdeveloper Apr 15, 2025
30944f5
chore: 🤖 add workflow to check for breaking changes
prashantasdeveloper Apr 23, 2025
691f181
chore: 🤖 upgrade dependencies
VictorVicente Apr 29, 2025
ad557db
chore: 🤖 add GA to auto-rebase next onto develop
prashantasdeveloper Apr 28, 2025
995f176
chore: 🤖 add runtime apis to generated types - regenerated types from…
F-OBrien Apr 30, 2025
6f27bab
feat: 🎸 create ballots namespace
sansan Feb 26, 2025
a771485
feat: 🎸 CorporateBallot entity
sansan Feb 26, 2025
aaaf045
feat: 🎸 get one existent ballot
sansan Feb 27, 2025
eac0d46
feat: 🎸 get all CorporateBallots for an Asset
sansan Mar 6, 2025
6bc3590
feat: 🎸 createBallot procedure
sansan Mar 13, 2025
eb91e62
feat: 🎸 remove CorporateBallot
sansan Mar 15, 2025
c564d01
refactor: 💡 pr comments
sansan Mar 31, 2025
fdaa0c7
feat: 🎸 modify CorporateBallot
sansan Mar 15, 2025
75b7a4e
refactor: 💡 pr comments
sansan Mar 31, 2025
8e874ee
refactor: 💡 update methods
sansan Mar 26, 2025
c19e61a
feat: 🎸 get ballot status
sansan Apr 1, 2025
1cfa23d
feat: 🎸 get ballot results
sansan Apr 3, 2025
c58c4d3
feat: 🎸 did participation in CorporateBallot
sansan Apr 3, 2025
0c58fc9
feat: 🎸 vote on CorporateBallot
sansan Apr 6, 2025
b06cbb0
refactor: 💡 pr comments
sansan Apr 10, 2025
79d9bf3
refactor: 💡 pr comments
sansan Apr 22, 2025
5182b19
refactor: 💡 pr comments
sansan Apr 28, 2025
ddfeb8f
refactor: 💡 use different query for get CorporateBallots
sansan Apr 28, 2025
dd6d402
refactor: 💡 fix error if no votes cast on results
sansan May 6, 2025
ec3856a
feat: 🎸 init CorporateAction
sansan Apr 28, 2025
9e22fe0
chore: 🤖 degrade semantic-release to 22.0.12
prashantasdeveloper May 15, 2025
bf1ce69
chore: 🤖 add support for `force-next-ff`
prashantasdeveloper May 16, 2025
ff9a940
chore: 🤖 use spec version to update README for docs
prashantasdeveloper May 19, 2025
a92c83f
chore: 🤖 remove force-next-ff
prashantasdeveloper May 23, 2025
9bfeadd
fix: 🐛 allow specify customClaimTypeId for TrustedClaimIssuer
sansan Feb 18, 2025
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
79 changes: 79 additions & 0 deletions .github/workflows/auto-rebase.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: Auto Rebase Next onto Develop

on:
push:
branches:
- develop

jobs:
rebase-next:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Set up Git
run: |
git config --global user.name "github-actions[bot]"
git config --global user.email "github-actions[bot]@users.noreply.github.com"

- name: Fetch all branches
run: |
git fetch --all
git checkout develop
git pull origin develop
git log --pretty=format:"%h -%an, %ai : %s" | head -n 5

- name: Create new branch for rebase
run: |
BRANCH_NAME="rebase-next-$(date +%s)"
git checkout next
git log --pretty=format:"%h -%an, %ai : %s" | head -n 5
git checkout -b "$BRANCH_NAME"
echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_ENV

- name: Rebase ${{ env.BRANCH_NAME }} onto develop
run: |
git rebase develop
git log --pretty=format:"%h -%an, %ai : %s" | head -n 10
continue-on-error: true # Continue even if conflicts occur

- name: Handle merge conflicts (if any)
run: |
while true; do
if [ -d ".git/rebase-merge" ] || [ -d ".git/rebase-apply" ]; then
# Add all files with conflict markers
git add .
if ! GIT_SEQUENCE_EDITOR=true GIT_EDITOR=true git rebase --continue; then
echo "Rebase step completed or failed"
if [ -d ".git/rebase-merge" ] || [ -d ".git/rebase-apply" ]; then
echo "Rebase still in progress, continuing..."
continue
else
echo "Rebase completed successfully"
break
fi
fi
else
echo "No rebase in progress"
break
fi
done

- name: Push rebased branch
run: git push -f origin ${{ env.BRANCH_NAME }}

- name: Create pull request
uses: thomaseizinger/create-pull-request@master
with:
github_token: ${{ secrets.ASSOCIATION_RELEASE_TOKEN }}
head: ${{ env.BRANCH_NAME }}
base: next
title: 'Auto-rebase: next onto latest develop'
body: |
This PR is automatically created by the auto-rebase workflow. It rebased the next branch onto latest develop and raised the PR including all merge conflicts.
Please review and merge it.

**NOTE:** Merge conflicts are not resolved in this PR and the commits from next needs to be resigned.
98 changes: 98 additions & 0 deletions .github/workflows/breaking-changes.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
name: Develop Breaking Changes

on:
pull_request:
types: [assigned, opened, reopened, synchronize]
branches: [develop]

jobs:
check-commit-messages:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Check commit messages for breaking changes
id: breaking_changes
env:
HEAD_SHA: ${{ github.event.pull_request.head.sha }}
BASE_SHA: ${{ github.event.pull_request.base.sha }}
run: |
# Function to check if breaking changes are present
check_breaking_changes() {
local commit=$1
local breaking=$(git show --pretty="format:%b" --no-patch $commit | grep -F "BREAKING CHANGE")

echo "Breaking: $breaking"

if [[ "$breaking" == *"BREAKING CHANGE"* ]]; then
echo "Commit $commit is a breaking change and cannot be merged into develop."
exit 1
fi

}

# Get all commits in the PR
commits=$(git rev-list $BASE_SHA..$HEAD_SHA)

# Iterate over all commits in the PR and verify each one
for COMMIT in $commits; do
check_breaking_changes $COMMIT
done

echo "No breaking changes detected."

check-api-snapshot:
name: Validate API snapshot
runs-on: ubuntu-latest

steps:
- name: Checkout PR branch (e.g. feat branch)
uses: actions/checkout@v4
with:
fetch-depth: 0 # needed for full branch context

- name: Setup Node
uses: actions/setup-node@v4
with:
node-version: '22.x'
cache: 'yarn'

- name: Install dependencies
run: yarn --frozen-lockfile

# Build and snapshot current PR branch
- name: Build PR declaration files
run: yarn build:declaration-only

- name: Generate PR API snapshot
run: |
yarn api-snapshot:generate
mv api-snapshot.json pr-api-snapshot.json

# # Checkout and build develop snapshot
# - name: Stash changes
# run: git stash --include-untracked

- name: Checkout develop branch
run: git checkout origin/develop

- name: Install dependencies (develop)
run: yarn --frozen-lockfile

- name: Build develop declaration files
run: yarn build:declaration-only

- name: Generate develop API snapshot
run: |
yarn api-snapshot:generate
mv api-snapshot.json develop-api-snapshot.json

# Compare snapshots: develop vs PR
- name: Compare API snapshots
run: |
cp develop-api-snapshot.json base-api-snapshot.json
cp pr-api-snapshot.json current-api-snapshot.json
yarn api-snapshot:compare
8 changes: 4 additions & 4 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: create branch
uses: peterjgrainger/[email protected]
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.ASSOCIATION_RELEASE_TOKEN }}
with:
branch: ${{ steps.setBranch.outputs.result }}
continue-on-error: true
Expand All @@ -45,13 +45,13 @@ jobs:
message: 'docs: autogenerate documentation'
ref: ${{ steps.setBranch.outputs.result }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.ASSOCIATION_RELEASE_TOKEN }}
- name: Upload docs to Wiki
uses: SwiftDocOrg/github-wiki-publish-action@v1
with:
path: 'docs'
env:
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GH_PERSONAL_ACCESS_TOKEN: ${{ secrets.ASSOCIATION_RELEASE_TOKEN }}

readme:
name: Readme
Expand All @@ -72,4 +72,4 @@ jobs:
add: 'README.md'
message: 'docs: update chain version in readme'
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.ASSOCIATION_RELEASE_TOKEN }}
2 changes: 1 addition & 1 deletion .github/workflows/fast-forward.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ jobs:
# never post a comment. (In all cases the information is
# still available in the step's summary.)
comment: on-error
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }} ## This allows to trigger push action from within this workflow. Read more - https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
GITHUB_TOKEN: ${{ secrets.ASSOCIATION_RELEASE_TOKEN }} ## This allows to trigger push action from within this workflow. Read more - https://docs.github.com/en/actions/using-workflows/triggering-a-workflow#triggering-a-workflow-from-a-workflow
6 changes: 3 additions & 3 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

on:
push:
branches: [master, beta, alpha]
branches: [master, develop, next]
pull_request:
types: [assigned, opened, synchronize, reopened]

Expand Down Expand Up @@ -66,7 +66,7 @@ jobs:
uses: SonarSource/sonarcloud-github-action@master
env:
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.ASSOCIATION_RELEASE_TOKEN }}
- uses: geekyeggo/delete-artifact@v5
with:
name: coverage-artifacts-*
Expand All @@ -93,7 +93,7 @@ jobs:
cp -R node_modules dist/node_modules
- name: release
env:
GITHUB_TOKEN: ${{ secrets.RELEASE_TOKEN }}
GITHUB_TOKEN: ${{ secrets.ASSOCIATION_RELEASE_TOKEN }}
NPM_TOKEN: ${{ secrets.ASSOCIATION_NPM_TOKEN }}
run: |
cd dist
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@ tsconfig.dev.json
.env
docs/
sdk-docs/
.history
.history

*api-snapshot.json
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

## Polymesh version

This release is compatible with Polymesh v7
This release is compatible with Polymesh v7.0, v7.1, v7.2

## Getting Started

Expand Down
12 changes: 8 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@
"generate:polkadot-types": "yarn fetch-metadata && yarn fetch-definitions && yarn generate:defs && yarn generate:meta && yarn generate:consts && yarn generate:post-process",
"generate:process-middleware-types": "ts-node scripts/processMiddlewareTypes.ts",
"generate:middleware-types": "graphql-codegen -c codegen.yaml && yarn generate:process-middleware-types",
"api-snapshot:generate": "ts-node scripts/generateApiSnapshot.ts",
"api-snapshot:compare": "ts-node scripts/compareApiSnapshot.ts",
"fetch-definitions": "cross-env node scripts/fetchDefinitions.js",
"fetch-metadata": "sh scripts/fetchMetadata.sh",
"update-readme": "cross-env node scripts/updateReadme.js",
Expand All @@ -34,8 +36,9 @@
"test": "POLKADOTJS_DISABLE_ESM_CJS_WARNING=1 jest --coverage",
"test:no-cov": "POLKADOTJS_DISABLE_ESM_CJS_WARNING=1 jest",
"build:ts": "ttsc -b tsconfig.lib.json",
"build:docs": "cross-env cp -R src src-temp && cross-env node scripts/prepareCodeForDocs.js && typedoc && rimraf src && mv src-temp src && cross-env node scripts/processDocs.js",
"build:sdk-docs": "cross-env cp -R src src-temp && cross-env node scripts/prepareCodeForDocs.js && typedoc --options sdk-docs-typedoc.json && rimraf src && mv src-temp src",
"build:declaration-only": "ttsc -p tsconfig.lib.json --emitDeclarationOnly",
"build:docs": "cross-env cp -R src src-temp && cross-env node scripts/prepareCodeForDocs.js && typedoc --tsconfig tsconfig.docs.json && rimraf src && mv src-temp src && cross-env node scripts/processDocs.js",
"build:sdk-docs": "cross-env cp -R src src-temp && cross-env node scripts/prepareCodeForDocs.js && typedoc --options sdk-docs-typedoc.json --tsconfig tsconfig.docs.json && rimraf src && mv src-temp src",
"commit": "npx git-cz",
"semantic-release": "semantic-release",
"lint": "eslint src --ext .js,.jsx,.ts,.tsx",
Expand Down Expand Up @@ -94,7 +97,7 @@
"prettier-eslint": "15.0.1",
"prettier-eslint-cli": "7.1.0",
"replace-in-file": "^7.0.1",
"semantic-release": "^24.2.0",
"semantic-release": "22.0.12",
"stream-browserify": "^3.0.0",
"ts-jest": "29.1.1",
"ts-loader": "9.4.4",
Expand All @@ -108,7 +111,7 @@
"typescript": "4.6.2",
"webpack": "5.94.0",
"webpack-cli": "^5.1.4",
"webpack-dev-server": "^5.0.4",
"webpack-dev-server": "^5.2.1",
"websocket-as-promised": "^2.0.1"
},
"config": {
Expand All @@ -134,6 +137,7 @@
"json-stable-stringify": "^1.0.2",
"lodash": "^4.17.21",
"semver": "^7.5.4",
"ts-morph": "^25.0.1",
"websocket": "^1.0.34"
},
"resolutions": {
Expand Down
6 changes: 3 additions & 3 deletions release.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ module.exports = {
branches: [
'master',
{
name: 'beta',
prerelease: true,
name: 'develop',
prerelease: 'beta',
},
{
name: 'alpha',
name: 'next',
prerelease: true,
},
{
Expand Down
Loading
Loading