forked from pyodide/pyodide
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into console-redirect-textio
- Loading branch information
Showing
359 changed files
with
4,067 additions
and
2,017 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "name": "Docker", | ||
| // keep in sync with "run_docker" | ||
| "image": "pyodide/pyodide-env:20240312-chrome122-firefox122", | ||
| "image": "pyodide/pyodide-env:20241106-chrome130-firefox132", | ||
| "remoteUser": "root", | ||
| "onCreateCommand": ".devcontainer/onCreate-docker.sh" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,15 +6,23 @@ on: | |
| workflow_dispatch: | ||
| inputs: | ||
| version: | ||
| description: "Version number" | ||
| description: "Version number to update to. This should not contain the 'v' prefix, since our releases on GitHub do not have it." | ||
| required: true | ||
|
|
||
| env: | ||
| version: ${{ github.event_name == 'release' && github.event.release.tag_name || github.event.inputs.version }} | ||
|
|
||
| jobs: | ||
| update_cross_build_releases: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Checkout | ||
| # Note: we check out the main branch so that the cross-build metadata | ||
| # file is always updated on top of the latest state of the repository. | ||
| - name: Checkout main branch | ||
| uses: actions/checkout@v4 | ||
| with: | ||
| submodules: recursive | ||
| ref: main | ||
|
|
||
| - uses: actions/setup-python@v5 | ||
| with: | ||
|
|
@@ -25,32 +33,41 @@ jobs: | |
| python -m pip install --upgrade pip | ||
| make pyodide_build | ||
| - name: Get version number (release) | ||
| if: github.event_name == 'release' | ||
| run: | | ||
| echo "VERSION=${{ github.event.release.tag_name }}" >> $GITHUB_ENV | ||
| - name: Get version number (workflow_dispatch) | ||
| if: github.event_name == 'workflow_dispatch' | ||
| run: | | ||
| echo "VERSION=${{ github.event.inputs.version }}" >> $GITHUB_ENV | ||
| - name: Update cross-build metadata file | ||
| id: update_cross_build_metadata | ||
| working-directory: tools | ||
| run: | | ||
| python update_cross_build_releases.py "${{ env.VERSION }}" | ||
| python update_cross_build_releases.py "${{ env.version }}" | ||
| - name: Create Pull Request | ||
| uses: peter-evans/create-pull-request@v6 | ||
| uses: peter-evans/create-pull-request@v7 | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| commit-message: Update cross-build metadata file for version ${{ env.VERSION }} [skip ci] | ||
| title: Update cross-build metadata file for version ${{ env.VERSION }} | ||
| commit-message: Update cross-build metadata file for version ${{ env.version }} [skip ci] | ||
| title: Update cross-build metadata file for version ${{ env.version }} | ||
| body: | | ||
| This PR updates the cross-build metadata file for version ${{ env.VERSION }} | ||
| branch: update-cross-build-metadata-${{ env.VERSION }} | ||
| This PR updates the cross-build metadata file for the new version ${{ env.version }}. | ||
| Requesting a review from the @pyodide/core team. | ||
| branch: update-cross-build-metadata-${{ env.version }} | ||
| base: main | ||
| branch-suffix: timestamp | ||
| draft: true | ||
| add-paths: | | ||
| pyodide-cross-build-environments.json | ||
|
|
||
| - name: Create an issue if the update fails | ||
| if: failure() || steps.update_cross_build_metadata.outcome == 'failure' | ||
| uses: dacbd/[email protected] | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} | ||
| title: Update cross-build metadata file for version ${{ env.VERSION }} failed | ||
| body: | | ||
| ## Description | ||
| The update of the cross-build metadata file for version ${{ env.VERSION }} failed. | ||
| ## Additional information | ||
| Please check the logs at ${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }} | ||
| for more information and update the metadata file manually if necessary. | ||
| labels: | ||
| assignees: ${{ github.actor }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,3 +41,4 @@ pytest-pyodide | |
| tools/symlinks | ||
| xbuildenv/ | ||
| .pyodide-xbuildenv* | ||
| DS_Store | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| [submodule "pyodide-build"] | ||
| path = pyodide-build | ||
| url = https://github.com/pyodide/pyodide-build |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.