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.

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

Release 0.24.2 rc.79 #2229

Closed
wants to merge 61 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
3b6b84c
try parallel release
bdemann Oct 14, 2024
b6aef35
WIP
bdemann Oct 14, 2024
2024b93
move into workflow
bdemann Oct 14, 2024
f78d288
fixup
bdemann Oct 14, 2024
52d6840
pass npm token secret
bdemann Oct 15, 2024
bff3610
fixup
bdemann Oct 15, 2024
a391563
fixup
bdemann Oct 15, 2024
1d4468d
install dfx before npm install
bdemann Oct 15, 2024
042cb70
make sure all commits are verified
bdemann Oct 15, 2024
1d94df3
add release version to the branch names
bdemann Oct 15, 2024
6a91528
add env variable
bdemann Oct 15, 2024
6bab4a4
update checkout
bdemann Oct 15, 2024
9b2f482
create branch
bdemann Oct 15, 2024
2da525f
remove sub release trouble shooter
bdemann Oct 15, 2024
41cffb9
make sure branches are unique
bdemann Oct 15, 2024
76f1f52
try these things
bdemann Oct 15, 2024
c539b67
update finalize release step
bdemann Oct 15, 2024
14fcc97
fetch the branch
bdemann Oct 15, 2024
d85a32d
clean up
bdemann Oct 16, 2024
58ba02b
use PAT
bdemann Oct 16, 2024
fcef3f5
correctly bring in the lastmjs pat
bdemann Oct 18, 2024
d4ebd9b
remove explicit path
bdemann Oct 18, 2024
f750d1a
Merge branch 'main' into parallel_release
lastmjs Oct 22, 2024
1b7da25
pr fixes
bdemann Oct 23, 2024
bda1f3c
further update names
bdemann Oct 23, 2024
73d0126
restore old husky install
bdemann Oct 24, 2024
10c660f
get rid of GH_TOKEN
bdemann Oct 24, 2024
e223122
Merge branch 'main' into parallel_release
bdemann Oct 24, 2024
eee67f6
install azle before updating azle
bdemann Oct 24, 2024
6386be2
bring back GH_TOKEN
bdemann Oct 24, 2024
ec0424d
try just fetching as we need
bdemann Oct 24, 2024
df84c5d
simpler getting of the current branch
bdemann Oct 24, 2024
39f42da
try a squashing strategy
bdemann Oct 24, 2024
bd559c3
just do fetch all
bdemann Oct 24, 2024
9929a89
switch to cherry picking
bdemann Oct 24, 2024
b81f015
do a soft reset to squash all commits into one
bdemann Oct 24, 2024
622de9d
try squash again
bdemann Oct 24, 2024
14df4fd
move install dfx into a setup dfx action
bdemann Oct 25, 2024
9cb3b93
fix include_npm
bdemann Oct 25, 2024
790eccb
run tests for benchmarks during release
bdemann Oct 25, 2024
f6d4ba6
try this just one more time
bdemann Oct 25, 2024
d2dda8b
skip some of the longer tests
bdemann Oct 25, 2024
37819f0
if we can't skip then at least don't include
bdemann Oct 25, 2024
d6c930b
try fetch depth 1
bdemann Oct 25, 2024
5ac562d
skip tests properly
bdemann Oct 25, 2024
8dac1a9
clean up release workflow
bdemann Oct 25, 2024
81f028c
add printing for troubleshooting
bdemann Oct 25, 2024
33c5498
this is crazy
bdemann Oct 25, 2024
cfbb5b5
try that
bdemann Oct 25, 2024
7d89b36
clean up
bdemann Oct 25, 2024
f54a68f
batch delete branches
bdemann Oct 25, 2024
8fbf45f
batch fetching
bdemann Oct 25, 2024
0213570
try that
bdemann Oct 25, 2024
0d49b81
show fetch refs
bdemann Oct 25, 2024
26bbf2b
remove white space
bdemann Oct 25, 2024
8207630
I don't see how this would be different
bdemann Oct 25, 2024
e74cee8
try that on for size
bdemann Oct 25, 2024
386e5b6
remove the ref nonsense
bdemann Oct 25, 2024
9e6ddf2
echo delete
bdemann Oct 25, 2024
5c5b5c7
release--0.24.2-rc.79
bdemann Oct 25, 2024
7b9a930
Update all dependencies for release 0.24.2-rc.79
lastmjs Oct 25, 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
14 changes: 0 additions & 14 deletions .github/actions/get_dfx_version/action.yml

This file was deleted.

6 changes: 6 additions & 0 deletions .github/actions/get_test_infos/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,9 @@ runs:
TEST_INFOS=$(./.github/actions/get_test_infos/get_test_infos.sh | base64 -d)
echo "test-infos=${TEST_INFOS}" >> "$GITHUB_OUTPUT"
shell: bash

- name: Echo test infos for troubleshooting
run: |
echo "Test Infos Output:"
echo "${{ steps.get-test-infos.outputs.test-infos }}"
shell: bash
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ checking out a specific branch.
steps:
- uses: actions/checkout@v4

- id: get-dfx-version
uses: ./.github/actions/get_dfx_version
- id: setup-dfx
uses: ./.github/actions/setup_dfx

- run: echo ${{ steps.get-dfx-version.outputs.dfx-version }}
- run: echo ${{ steps.setup-dfx.outputs.dfx-version }}
```
27 changes: 27 additions & 0 deletions .github/actions/setup_dfx/action.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Setup dfx
description: 'Sets up dfx by detecting version from package.json and installing it. (Note: DFX must be installed before `npm install` because the azle installation process requires dfx)'
inputs:
dfx-version:
description: 'The version of dfx to install (optional - will read from package.json if not provided)'
required: false
outputs:
dfx-version:
description: 'The version of dfx that was installed'
value: ${{ steps.get-dfx-version.outputs.dfx-version }}
runs:
using: composite
steps:
- id: get-dfx-version
if: inputs.dfx-version == ''
run: |
DFX_VERSION=$(jq -r '.azle.globalDependencies.dfx // error("dfx version not found")' "package.json")
echo "dfx-version=${DFX_VERSION}" >> "$GITHUB_OUTPUT"
shell: bash

- name: Install dfx
run: |
VERSION="${{ inputs.dfx-version || steps.get-dfx-version.outputs.dfx-version }}"
# Install dfx (Note: dfx must be installed before `npx azle` because the azle installation process requires dfx)
src/build/stable/commands/install_global_dependencies/install_dfx.sh $VERSION
echo "$HOME/.local/share/dfx/bin" >> $GITHUB_PATH
shell: bash
46 changes: 23 additions & 23 deletions .github/scripts/publish_github_action.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,34 +26,34 @@ else
npm publish
fi

# TODO loop through checking for the status instead of sleeping
echo -e "sleeping for 30 seconds to ensure azle@$VERSION is fully registered on npm"
# # TODO loop through checking for the status instead of sleeping
# echo -e "sleeping for 30 seconds to ensure azle@$VERSION is fully registered on npm"

sleep 30
# sleep 30

for directory in ${directories[@]}
do
cd "$directory"
echo "updating $directory"
# for directory in ${directories[@]}
# do
# cd "$directory"
# echo "updating $directory"

sed -E -i "s/(\"azle\": \")(.*)(\")/\1$VERSION\3/" package.json
npm install
# sed -E -i "s/(\"azle\": \")(.*)(\")/\1$VERSION\3/" package.json
# npm install

rm -rf node_modules
# rm -rf node_modules

cd $root_dir
done
# cd $root_dir
# done

git add --all
git commit -am "azle-bot automated release $VERSION"
git push origin $GITHUB_HEAD_REF
# git add --all
# git commit -am "azle-bot automated release $VERSION"
# git push origin $GITHUB_HEAD_REF

git tag $VERSION
git push origin $VERSION
# git tag $VERSION
# git push origin $VERSION

if [[ "$VERSION" == *"-rc."* ]];
then
gh release create "$VERSION" -t "$VERSION" --prerelease
else
gh release create "$VERSION" -t "$VERSION"
fi
# if [[ "$VERSION" == *"-rc."* ]];
# then
# gh release create "$VERSION" -t "$VERSION" --prerelease
# else
# gh release create "$VERSION" -t "$VERSION"
# fi
84 changes: 9 additions & 75 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@ on:
push:
branches:
- main
pull_request: # Runs on pull requests to any branch
pull_request:

jobs:
determine-should-release:
if: ${{ startsWith(github.head_ref, 'release--') }}
Expand All @@ -17,84 +18,17 @@ jobs:
- id: determine-should-release
uses: ./.github/actions/should_release

get-test-infos:
needs: determine-should-release
if: ${{ startsWith(github.head_ref, 'release--') && needs.determine-should-release.outputs.should-release }}
name: Get test infos
runs-on: ubuntu-latest
outputs:
test-infos: ${{ steps.get-test-infos.outputs.test-infos }}
steps:
- uses: actions/checkout@v4

- id: get-node-version
uses: ./.github/actions/get_node_version

- name: Get all test infos
id: get-test-infos
uses: ./.github/actions/get_test_infos
with:
node-version: ${{ steps.get-node-version.outputs.node-version }}
directories: |
./examples
./tests

release:
name: Deploy release
# Only run this job if it's a release branch. This job will run instead of run-tests and will automatically publish another commit which will be tested
if: ${{ needs.determine-should-release.outputs.should-release == 'true' }}

needs:
- determine-should-release
- get-test-infos
runs-on: ubuntu-latest
env:
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }} # All commits must be verified
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref || github.ref }}
token: ${{ secrets.LASTMJS_GITHUB_TOKEN || github.token }}

- id: get-node-version
uses: ./.github/actions/get_node_version

- uses: actions/setup-node@v4
with:
node-version: ${{ steps.get-node-version.outputs.node-version }}
registry-url: https://registry.npmjs.org
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

- name: Install curl
run: sudo apt-get install curl -y

- id: get-dfx-version
uses: ./.github/actions/get_dfx_version

- name: Install dfx
run: |
# Install dfx (Note: dfx must be installed before `npx azle` because the azle installation process requires dfx)
src/build/stable/commands/install_global_dependencies/install_dfx.sh ${{ steps.get-dfx-version.outputs.dfx-version }}
echo "$HOME/.local/share/dfx/bin" >> $GITHUB_PATH

- run: npm install

- name: Install global dependencies
run: |
AZLE_VERBOSE=true npx azle install-global-dependencies --rust --wasi2ic

# TODO we should use some Action-specific bot account
- name: Configure git for publishing release
run: |
git config --global user.name 'Jordan Last'
git config --global user.email '[email protected]'
git config --global commit.gpgsign true
echo -n "$GPG_SIGNING_KEY" | base64 --decode | gpg --import
git config --global user.signingkey C8B77BCBE16CD2B94B43F9C8757397B82D4ED7B0

- name: Publish release
run: |
BRANCH_NAME="${{ github.head_ref }}"
RELEASE_VERSION="${BRANCH_NAME:9}"
./.github/scripts/publish_github_action.sh $RELEASE_VERSION ${{ toJSON(needs.get-test-infos.outputs.test-infos) }}
uses: ./.github/workflows/release_parallel.yml
secrets:
GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
LASTMJS_GITHUB_TOKEN: ${{ secrets.LASTMJS_GITHUB_TOKEN }}
Loading
Loading