Skip to content

Commit 091bbdd

Browse files
IsabelParedesIsabelParedes
authored
Merge branch 'main' into bump-tree-sitter-python_0.23.6_to_0.25.0_for_main
2 parents c78c912 + 2549b40 commit 091bbdd

File tree

221 files changed

+4086
-1602
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+4086
-1602
lines changed

‎.github/workflows/.condarc‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.github/workflows/build_docs.yaml‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: docs
1+
name: Docs
22

33
on:
44
workflow_dispatch:
@@ -8,6 +8,7 @@ on:
88
pull_request:
99
paths:
1010
- 'docs/**'
11+
1112
jobs:
1213

1314
build_docs:
@@ -23,24 +24,27 @@ jobs:
2324
# SETUP
2425
################################################################
2526
- name: Checkout repo
26-
uses: actions/checkout@v4
27+
uses: actions/checkout@v5
2728
with:
2829
fetch-depth: 0
2930

3031
################################################################
3132
# CONFIG
3233
################################################################
33-
- uses: prefix-dev/setup-pixi@v0.6.0
34-
with:
35-
pixi-version: v0.20.1
36-
- run: |
37-
pixi run docs-build -d docs_build
34+
- name: Setup pixi
35+
uses: prefix-dev/setup-pixi@v0.9.0
36+
37+
################################################################
38+
# BUILD
39+
################################################################
40+
- name: Build docs
41+
run: pixi run docs-build -d docs_build
3842

3943
################################################################
40-
# upload to github pages
44+
# UPLOAD
4145
################################################################
4246
- name: Upload Pages artifact
43-
uses: actions/upload-pages-artifact@v3
47+
uses: actions/upload-pages-artifact@v4
4448
with:
4549
path: docs_build
4650

‎.github/workflows/build_recipes.yaml‎

Lines changed: 5 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
name: build recipes
1+
name: Build Recipes
2+
23
on:
34
push:
45
branches:
@@ -10,48 +11,11 @@ on:
1011
- "recipes/**"
1112

1213
jobs:
13-
lint_recipes:
14-
runs-on: ubuntu-latest
15-
steps:
16-
- name: Checkout repo
17-
uses: actions/checkout@v4
18-
with:
19-
fetch-depth: 0
20-
ref: ${{ github.sha }}
21-
22-
- name: Fetch main branch
23-
run: |
24-
git fetch origin main
25-
26-
- name: Install micromamba
27-
uses: mamba-org/setup-micromamba@v1
28-
with:
29-
micromamba-version: "1.5.8-0"
30-
environment-file: ci_env.yml
31-
environment-name: ci
32-
init-shell: bash
33-
cache-environment: false
34-
post-cleanup: "all"
35-
36-
- name: Lint recipes
37-
shell: bash -el {0}
38-
run: |
39-
set -e
40-
41-
if [ "${{ github.event_name }}" = "pull_request" ]; then
42-
BASE_REF="origin/main"
43-
HEAD_REF="HEAD"
44-
else
45-
BASE_REF="HEAD~1"
46-
HEAD_REF="HEAD"
47-
fi
48-
49-
echo "Comparing changes between $BASE_REF and $HEAD_REF"
50-
python -m emci build lint $BASE_REF $HEAD_REF
5114

5215
build_recipes:
5316
runs-on: ubuntu-latest
5417
env:
18+
FORCE_COLOR: 1
5519
TARGET_PLATFORM: emscripten-wasm32
5620
GITHUB_OWNER: "emscripten-forge"
5721
strategy:
@@ -62,17 +26,10 @@ jobs:
6226
# SETUP
6327
################################################################
6428
- name: Checkout repo
65-
uses: actions/checkout@v4
29+
uses: actions/checkout@v5
6630
with:
6731
fetch-depth: 0
6832

69-
- name: Maximize build space
70-
run: |
71-
sudo rm -rf /usr/share/dotnet
72-
sudo rm -rf /opt/ghc
73-
sudo rm -rf "/usr/local/share/boost"
74-
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
75-
7633
- name: apt-install playwright dependencies
7734
run: |
7835
sudo apt-get update -y && sudo apt-get install -y \
@@ -99,11 +56,9 @@ jobs:
9956
# MAMBA
10057
################################################################
10158
- name: Install micromamba
102-
uses: mamba-org/setup-micromamba@v1
59+
uses: mamba-org/setup-micromamba@v2
10360
with:
104-
micromamba-version: "1.5.8-0"
10561
environment-file: ci_env.yml
106-
environment-name: ci
10762
init-shell: bash
10863
cache-environment: false
10964
post-cleanup: "all"

‎.github/workflows/copilot-setup-steps.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Copilot Setup Steps"
1+
name: Copilot Setup
22

33
# Automatically run the setup steps when they are changed to allow for easy validation, and
44
# allow manual testing through the repository's "Actions" tab
@@ -27,7 +27,7 @@ jobs:
2727
steps:
2828

2929
- name: Checkout repo
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
with:
3232
fetch-depth: 0
33-
- uses: prefix-dev/setup-pixi@v0.9.0
33+
- uses: prefix-dev/setup-pixi@v0.9.0

‎.github/workflows/delete_package.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ def main():
66
parser = argparse.ArgumentParser(description='Delete a package from prefix.dev')
77
parser.add_argument('--token', required=True, help='API token')
88
parser.add_argument('--package', required=True, help='Package file name')
9-
9+
parser.add_argument('--channel', required=True, help='Package file name')
1010
args = parser.parse_args()
1111

1212
token = args.token
1313
package_file_name = args.package
14+
channel = args.channel
1415

1516
base_url = "https://prefix.dev/api/v1"
16-
channel = "emscripten-forge-dev"
1717
subdir = "emscripten-wasm32"
1818
headers = {"Authorization": f"Bearer {token}"}
1919
delete_url = f"{base_url}/delete/{channel}/{subdir}/{package_file_name}"

‎.github/workflows/delete_package.yaml‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,17 @@ on:
77
description: Name of the package to be deleted
88
required: true
99
default: myBadPackage-9.4.0-py313h6e18b15_0.tar.bz2
10+
channel_name:
11+
description: Name of the channel
12+
required: true
13+
default: emscripten-forge-dev
1014

1115
jobs:
1216
delete_package:
1317
runs-on: ubuntu-latest
1418
steps:
1519
- name: Checkout repo
16-
uses: actions/checkout@v4
20+
uses: actions/checkout@v5
1721

1822
- name: Install micromamba
1923
uses: mamba-org/setup-micromamba@v2
@@ -29,7 +33,10 @@ jobs:
2933
env:
3034
PREFIX_DEV_API_KEY: ${{ secrets.PREFIX_DEV_API_KEY }}
3135
PACKAGE_NAME: ${{ github.event.inputs.package_name }}
36+
CHANNEL_NAME: ${{ github.event.inputs.channel_name }}
3237
run: |
3338
python .github/workflows/delete_package.py \
34-
--token "$PREFIX_DEV_API_KEY" --package "$PACKAGE_NAME"
39+
--token "$PREFIX_DEV_API_KEY" \
40+
--package "$PACKAGE_NAME" \
41+
--channel "$CHANNEL_NAME"
3542

‎.github/workflows/lint_recipes.yaml‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
name: Lint Recipes
2+
3+
on:
4+
push:
5+
branches:
6+
- "main"
7+
paths:
8+
- "recipes/**"
9+
pull_request:
10+
paths:
11+
- "recipes/**"
12+
13+
jobs:
14+
lint_recipes:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- name: Checkout repo
18+
uses: actions/checkout@v5
19+
with:
20+
fetch-depth: 0
21+
ref: ${{ github.sha }}
22+
23+
- name: Fetch main branch
24+
run: git fetch origin main
25+
26+
- name: Install micromamba
27+
uses: mamba-org/setup-micromamba@v2
28+
with:
29+
environment-file: ci_env.yml
30+
init-shell: bash
31+
post-cleanup: "all"
32+
33+
- name: Lint recipes
34+
shell: bash -el {0}
35+
run: |
36+
set -e
37+
38+
if [ "${{ github.event_name }}" = "pull_request" ]; then
39+
BASE_REF="origin/main"
40+
HEAD_REF="HEAD"
41+
else
42+
BASE_REF="HEAD~1"
43+
HEAD_REF="HEAD"
44+
fi
45+
46+
echo "Comparing changes between $BASE_REF and $HEAD_REF"
47+
python -m emci build lint $BASE_REF $HEAD_REF

‎.github/workflows/new_versions.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,26 @@ on:
66
- cron: '0 0 * * *'
77

88
jobs:
9+
910
update_versions:
1011
strategy:
1112
matrix:
12-
branch: [main]
13-
13+
branch: [main, emscripten-4x]
1414

1515
if: (github.event_name == 'schedule' && github.repository == 'emscripten-forge/recipes') || (github.event_name != 'schedule')
1616
runs-on: [ubuntu-latest]
1717
steps:
18-
- uses: actions/checkout@v4
18+
- uses: actions/checkout@v5
1919
with:
2020
ref: main
2121

2222
- name: Install micromamba
23-
uses: mamba-org/setup-micromamba@v1
23+
uses: mamba-org/setup-micromamba@v2
2424
with:
2525
environment-file: ci_env.yml
2626

2727
- name: Determine new package version and open/merge PRs
2828
shell: bash -l -eo pipefail {0}
29-
run: python -m emci bot bump-recipes-versions ${{ matrix.branch }}
29+
run: python -m emci bot bump-recipes-versions ${{ matrix.branch }}
3030
env:
3131
GITHUB_TOKEN: ${{ secrets.BOT_ACCESS_TOKEN }}

‎emci/__main__.py‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,13 @@ def bump_recipes_versions(target_branch_name: str):
7575

7676
bump_recipe_versions(RECIPES_EMSCRIPTEN_DIR, target_branch_name)
7777

78+
@bot_app.command()
79+
def build_missing_recipes(target_branch_name: str):
80+
from .bot.build_missing_recipes import build_missing_recipes
81+
build_missing_recipes(RECIPES_EMSCRIPTEN_DIR, target_branch_name)
82+
83+
84+
7885
@build_app.command()
7986
def lint(old: str, new: str):
8087
"""
@@ -116,5 +123,8 @@ def lint(old: str, new: str):
116123
print("✅ All changed recipes passed validation")
117124

118125

126+
127+
128+
119129
if __name__ == "__main__":
120130
app()

0 commit comments

Comments
 (0)