Skip to content

Commit

Permalink
Merge branch 'main' into fix/allow-new-gql-version-notation
Browse files Browse the repository at this point in the history
  • Loading branch information
fregataa authored Jan 6, 2025
2 parents 53a1e02 + 86a1b9e commit d4d04a9
Show file tree
Hide file tree
Showing 8 changed files with 32 additions and 444 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -332,11 +332,11 @@ jobs:
strategy:
fail-fast: false
matrix:
# ubuntu-latest: x86-64
# ubuntu-22.04: x86-64
# ubuntu-22.04-arm64: aarch64
# macos-12: intel
# macos-13: apple silicon
os: [ubuntu-latest, ubuntu-22.04-arm64, macos-13-xlarge, macos-12-large]
# macos-14-large: intel
# macos-14-xlarge: apple silicon
os: [ubuntu-22.04, ubuntu-22.04-arm64, macos-14-xlarge, macos-14-large]
runs-on: ${{ matrix.os }}
steps:
- name: Check out the revision
Expand Down Expand Up @@ -388,7 +388,7 @@ jobs:
build-wheels:
needs: [lint, typecheck, test, check-alembic-migrations]
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
runs-on: ubuntu-latest
runs-on: ubuntu-22.04
steps:
- name: Check out the revision
uses: actions/checkout@v4
Expand Down
447 changes: 17 additions & 430 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
24.12.0
24.12.1
1 change: 0 additions & 1 deletion changes/3222.fix.md

This file was deleted.

1 change: 0 additions & 1 deletion changes/3309.misc.md

This file was deleted.

1 change: 0 additions & 1 deletion changes/3337.fix.md

This file was deleted.

4 changes: 4 additions & 0 deletions changes/template.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,7 @@ No significant changes.
No significant changes.
{%- endif %}
{%- endfor %}



{# NOTE: keep trailing newlines #}
10 changes: 5 additions & 5 deletions tools/pants-plugins/scie/subsystems.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ class Science(TemplatedExternalTool):
options_scope = "science"
help = softwrap("""A high level tool to build scies with.""")

default_version = "0.4.1"
default_version = "0.10.0"
default_known_versions = [
"0.4.1|linux_arm64|d2983bc3b293ae59f9aad83968a1ac41d1c761b53504819b243fd8a40e5db30f|8547671",
"0.4.1|linux_x86_64|f5eda054ae3a2ce14e029d723acac7a2e76f21051fdbdad86adfd0916f512887|9706622",
"0.4.1|macos_arm64|cd2edd426d706181bace3b1663aef429e753072a73b850b69d971136ab23ff92|4286359",
"0.4.1|macos_x86_64|0b5969f379baa9e32f832996d134ac11b84618103c58a1231d81d5a98c5570e9|4483114",
"0.10.0|linux_arm64|877c45f5a5f502a4147bbfd809d1305d5afbde8be1d53036fc67d58dc899c03b|8610020",
"0.10.0|linux_x86_64|89ce91a6b895506ee31665caf0b96bf290a5889c35b82e96e9b4cdc4b164dc98|9921362",
"0.10.0|macos_arm64|a2f8a62f92f1ac53895196c769ac8d9de83044bbea444d2aa62ddf19dbc074f1|4448491",
"0.10.0|macos_x86_64|ebfa77f75789b9258e7b7ee1094849e63a47e1abacf0cd4fc3bc233bd6fea7d6|4556920",
]

default_url_template = (
Expand Down

0 comments on commit d4d04a9

Please sign in to comment.