Skip to content

Commit cb18e76

Browse files
ryanvolzryanvolz
authored
Merge pull request #105 from MITHaystack/dependabot/github_actions/actions-94f7f9f606
General CI update and Dependabot: bump the actions group across 1 directory with 4 updates
2 parents bdabdfb + 13c5b82 commit cb18e76

10 files changed

Lines changed: 60 additions & 45 deletions

.ci_support/linux_64_python3.12.____cpython.yaml renamed to .ci_support/linux_64_python3.13.____cp313.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ace:
2-
- 8.0.4
2+
- 8.0.5
33
c_compiler:
44
- gcc
55
c_compiler_version:
@@ -8,8 +8,6 @@ c_stdlib:
88
- sysroot
99
c_stdlib_version:
1010
- '2.17'
11-
cdt_name:
12-
- conda
1311
channel_sources:
1412
- conda-forge
1513
channel_targets:
@@ -27,6 +25,6 @@ pin_run_as_build:
2725
min_pin: x.x
2826
max_pin: x.x
2927
python:
30-
- 3.12.* *_cpython
28+
- 3.13.* *_cp313
3129
target_platform:
3230
- linux-64

.ci_support/linux_aarch64_python3.12.____cpython.yaml renamed to .ci_support/linux_aarch64_python3.13.____cp313.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ace:
2-
- 8.0.4
2+
- 8.0.5
33
c_compiler:
44
- gcc
55
c_compiler_version:
@@ -8,8 +8,6 @@ c_stdlib:
88
- sysroot
99
c_stdlib_version:
1010
- '2.17'
11-
cdt_name:
12-
- conda
1311
channel_sources:
1412
- conda-forge
1513
channel_targets:
@@ -27,6 +25,6 @@ pin_run_as_build:
2725
min_pin: x.x
2826
max_pin: x.x
2927
python:
30-
- 3.12.* *_cpython
28+
- 3.13.* *_cp313
3129
target_platform:
3230
- linux-aarch64

.ci_support/osx_64_python3.12.____cpython.yaml renamed to .ci_support/osx_64_python3.13.____cp313.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
33
MACOSX_SDK_VERSION:
44
- '10.13'
55
ace:
6-
- 8.0.4
6+
- 8.0.5
77
c_compiler:
88
- clang
99
c_compiler_version:
@@ -29,6 +29,6 @@ pin_run_as_build:
2929
min_pin: x.x
3030
max_pin: x.x
3131
python:
32-
- 3.12.* *_cpython
32+
- 3.13.* *_cp313
3333
target_platform:
3434
- osx-64

.ci_support/osx_arm64_python3.12.____cpython.yaml renamed to .ci_support/osx_arm64_python3.13.____cp313.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
33
MACOSX_SDK_VERSION:
44
- '11.0'
55
ace:
6-
- 8.0.4
6+
- 8.0.5
77
c_compiler:
88
- clang
99
c_compiler_version:
@@ -29,6 +29,6 @@ pin_run_as_build:
2929
min_pin: x.x
3030
max_pin: x.x
3131
python:
32-
- 3.12.* *_cpython
32+
- 3.13.* *_cp313
3333
target_platform:
3434
- osx-arm64

.ci_support/win_64_python3.12.____cpython.yaml renamed to .ci_support/win_64_python3.13.____cp313.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
ace:
2-
- 8.0.4
2+
- 8.0.5
33
c_compiler:
44
- vs2022
55
c_stdlib:
@@ -19,6 +19,6 @@ pin_run_as_build:
1919
min_pin: x.x
2020
max_pin: x.x
2121
python:
22-
- 3.12.* *_cpython
22+
- 3.13.* *_cp313
2323
target_platform:
2424
- win-64

‎.github/workflows/cd.yml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ jobs:
2323
name: Make SDist
2424
runs-on: ubuntu-latest
2525
steps:
26-
- uses: actions/checkout@v6
26+
- uses: actions/checkout@v6.0.1
2727
with:
2828
fetch-depth: 0
2929

3030
- name: Build SDist
3131
run: pipx run build --sdist
3232

33-
- uses: actions/upload-artifact@v5
33+
- uses: actions/upload-artifact@v6.0.0
3434
with:
3535
name: cibw-sdist
3636
path: dist/*.tar.gz
@@ -41,31 +41,31 @@ jobs:
4141
strategy:
4242
fail-fast: false
4343
matrix:
44-
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-14, macos-13]
44+
os: [ubuntu-latest, ubuntu-24.04-arm, windows-latest, macos-latest, macos-15-intel]
4545
include:
4646
- os: ubuntu-latest
4747
cibw_archs: x86_64
4848
cibw_build: "*"
49-
cibw_skip: "pp* *musllinux* cp314*"
49+
cibw_skip: "pp* *musllinux* cp314t*"
5050
- os: ubuntu-24.04-arm
5151
cibw_archs: aarch64
5252
cibw_build: "*"
53-
cibw_skip: "cp38* pp* *musllinux* cp314*"
53+
cibw_skip: "cp38* pp* *musllinux* cp314t*"
5454
- os: windows-latest
5555
cibw_archs: AMD64
5656
cibw_build: "*"
57-
cibw_skip: "pp* *musllinux* cp314*"
58-
- os: macos-14
57+
cibw_skip: "pp* *musllinux* cp314t*"
58+
- os: macos-latest
5959
cibw_archs: arm64
6060
cibw_build: "*"
61-
cibw_skip: "pp* *musllinux* cp314*"
62-
- os: macos-13
61+
cibw_skip: "pp* *musllinux* cp314t*"
62+
- os: macos-15-intel
6363
cibw_archs: x86_64
6464
cibw_build: "*"
65-
cibw_skip: "pp* *musllinux* cp314*"
65+
cibw_skip: "pp* *musllinux* cp314t*"
6666

6767
steps:
68-
- uses: actions/checkout@v6
68+
- uses: actions/checkout@v6.0.1
6969
with:
7070
fetch-depth: 0
7171

@@ -77,7 +77,7 @@ jobs:
7777
CIBW_SKIP: ${{ matrix.cibw_skip }}
7878

7979
- name: Upload wheels
80-
uses: actions/upload-artifact@v5
80+
uses: actions/upload-artifact@v6.0.0
8181
with:
8282
name: cibw-wheels-${{ matrix.os }}-${{ strategy.job-index }}
8383
path: wheelhouse/*.whl
@@ -93,14 +93,14 @@ jobs:
9393
if: github.event_name == 'release' && github.event.action == 'published'
9494

9595
steps:
96-
- uses: actions/download-artifact@v6
96+
- uses: actions/download-artifact@v7
9797
with:
9898
pattern: cibw-*
9999
path: dist
100100
merge-multiple: true
101101

102102
- name: Generate artifact attestations
103-
uses: actions/attest-build-provenance@v3.0.0
103+
uses: actions/attest-build-provenance@v3.1.0
104104
with:
105105
subject-path: "dist/*"
106106

‎.github/workflows/conda-build.yml‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,37 @@ jobs:
2323
fail-fast: false
2424
matrix:
2525
include:
26-
- CONFIG: linux_64_python3.12.____cpython
27-
SHORT_CONFIG: linux_64_python3.12.____cpython
26+
- CONFIG: linux_64_python3.13.____cp313
27+
SHORT_CONFIG: linux_64_python3.13.____cp313
2828
UPLOAD_PACKAGES: True
2929
os: ubuntu
3030
runs_on: ['ubuntu-latest']
3131
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
32-
- CONFIG: linux_aarch64_python3.12.____cpython
33-
SHORT_CONFIG: linux_aarch64_python3.12.____cpython
32+
- CONFIG: linux_aarch64_python3.13.____cp313
33+
SHORT_CONFIG: linux_aarch64_python3.13.____cp313
3434
UPLOAD_PACKAGES: True
3535
os: ubuntu
3636
runs_on: ['ubuntu-latest']
3737
DOCKER_IMAGE: quay.io/condaforge/linux-anvil-x86_64:alma9
38-
- CONFIG: osx_64_python3.12.____cpython
39-
SHORT_CONFIG: osx_64_python3.12.____cpython
38+
- CONFIG: osx_64_python3.13.____cp313
39+
SHORT_CONFIG: osx_64_python3.13.____cp313
4040
UPLOAD_PACKAGES: True
4141
os: macos
42-
runs_on: ['macos-13']
43-
- CONFIG: osx_arm64_python3.12.____cpython
44-
SHORT_CONFIG: osx_arm64_python3.12.____cpython
42+
runs_on: ['macos-15-intel']
43+
- CONFIG: osx_arm64_python3.13.____cp313
44+
SHORT_CONFIG: osx_arm64_python3.13.____cp313
4545
UPLOAD_PACKAGES: True
4646
os: macos
47-
runs_on: ['macos-13']
48-
- CONFIG: win_64_python3.12.____cpython
49-
SHORT_CONFIG: win_64_python3.12.____cpython
47+
runs_on: ['macos-15-intel']
48+
- CONFIG: win_64_python3.13.____cp313
49+
SHORT_CONFIG: win_64_python3.13.____cp313
5050
UPLOAD_PACKAGES: True
5151
os: windows
5252
runs_on: ['windows-latest']
5353
steps:
5454

5555
- name: Checkout code
56-
uses: actions/checkout@93cb6efe18208431cddfb8368fd83d5badbf9bfd # v4.1.4
56+
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b # v4.1.4
5757
with:
5858
fetch-depth: 0
5959

@@ -194,7 +194,7 @@ jobs:
194194
fi
195195
196196
- name: Store conda build artifacts
197-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
197+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
198198
if: ${{ always() && steps.prepare-artifacts.outcome == 'success' }}
199199
with:
200200
name: ${{ steps.prepare-artifacts.outputs.BLD_ARTIFACT_NAME }}
@@ -203,7 +203,7 @@ jobs:
203203
continue-on-error: true
204204

205205
- name: Store conda build environment artifacts
206-
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
206+
uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
207207
# only relevant if build failed, see above
208208
if: ${{ always() && steps.determine-status.outputs.status == 'failure' && steps.prepare-artifacts.outcome == 'success' }}
209209
with:

‎.github/workflows/lint.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-latest
88
name: flake8-black
99
steps:
10-
- uses: actions/checkout@v6
10+
- uses: actions/checkout@v6.0.1
1111
- name: Set up Python environment
1212
uses: actions/setup-python@v6
1313
with:

‎.scripts/run_osx_build.sh‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,25 @@ if [[ "${sha:-}" == "" ]]; then
6363
sha=$(git rev-parse HEAD)
6464
fi
6565

66+
if [[ "${OSX_SDK_DIR:-}" == "" ]]; then
67+
if [[ "${CI:-}" == "" ]]; then
68+
echo "Please set OSX_SDK_DIR to a directory where SDKs can be downloaded to. Aborting"
69+
exit 1
70+
else
71+
export OSX_SDK_DIR=/opt/conda-sdks
72+
/usr/bin/sudo mkdir -p "${OSX_SDK_DIR}"
73+
/usr/bin/sudo chown "${USER}" "${OSX_SDK_DIR}"
74+
fi
75+
else
76+
if tmpf=$(mktemp -p "$OSX_SDK_DIR" tmp.XXXXXXXX 2>/dev/null); then
77+
rm -f "$tmpf"
78+
echo "OSX_SDK_DIR is writeable without sudo, continuing"
79+
else
80+
echo "User-provided OSX_SDK_DIR is not writeable for current user! Aborting"
81+
exit 1
82+
fi
83+
fi
84+
6685
echo -e "\n\nRunning the build setup script."
6786
source run_conda_forge_build_setup
6887

‎recipes/conda/meta.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ source:
1717

1818
build:
1919
number: 0
20-
skip: true # [os.environ.get("RENDER_LIMIT_PYTHON") and py != 312]
20+
skip: true # [os.environ.get("RENDER_LIMIT_PYTHON") and py != 313]
2121
run_exports:
2222
- {{ pin_subpackage('digital_rf') }}
2323
entry_points:

0 commit comments

Comments
 (0)