Skip to content

Commit

Permalink
release--0.24.2-rc.49
Browse files Browse the repository at this point in the history
  • Loading branch information
bdemann committed Oct 24, 2024
1 parent 10c660f commit debc1c2
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ jobs:

get-test-infos:
needs: determine-should-release
# TODO can we simplify this?
# TODO make a master workflow that determines which workflow to run and when. And then all other workflows must be called and not run automatically
if: ${{ startsWith(github.head_ref, 'release--') && needs.determine-should-release.outputs.should-release }}
name: Get test infos
runs-on: ubuntu-latest
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/release_parallel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -176,19 +176,22 @@ jobs:
echo "Current branch: $CURRENT_BRANCH"
# Fetch all branches
# TODO do we need this if we have fetch-depth: 0?
git fetch --all
# List and merge update branches
for branch in $(git branch -r | grep "origin/update-${{ needs.prepare-release.outputs.release-version }}-" | sed 's/origin\///'); do
echo "Merging branch: $branch"
git fetch origin $branch:$branch
# TODO do we need this if we have fetch-depth: 0?
git merge --no-ff "$branch" -m "Merge $branch" || {
echo "Failed to merge $branch"
git merge --abort
continue
}
# Delete the remote branch after successful merge
# TODO --delete branch1 branch2 branch3 etc
git push origin --delete "$branch"
echo "Deleted remote branch: $branch"
done
Expand Down
2 changes: 1 addition & 1 deletion dfx_extension/extension.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azle",
"version": "0.24.1",
"version": "0.24.2-rc.49",
"homepage": "https://github.com/dfinity/dfx-extensions",
"authors": "",
"summary": "",
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "azle",
"version": "0.24.1",
"version": "0.24.2-rc.49",
"description": "TypeScript and JavaScript CDK for the Internet Computer",
"scripts": {
"typecheck": "tsc --noEmit",
Expand Down

0 comments on commit debc1c2

Please sign in to comment.