Skip to content

CI: fix Windows NSIS install race, drop macos-latest-large, sync template action versions #286

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.

Sign up for GitHub

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

Merged
yarikoptic merged 2 commits into from
Aug 5, 2026
Merged

CI: fix Windows NSIS install race, drop macos-latest-large, sync template action versions #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f44b507
CI: fix Windows NSIS install race, drop macos-latest-large, sync temp…
yarikoptic Aug 4, 2026
08a4cc4
CI: pin magic-1.1 in stack extra-deps to unblock Windows/macOS build
yarikoptic Aug 5, 2026
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
3 changes: 3 additions & 0 deletions .github/workflows/build-macos-arm64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ jobs:
- name: Enable building with magic
run: |
perl -pli -e 's/magicmime: false/magicmime: true/' stack.yaml
# lts-24 caps `magic` at 1.1 while some transitive dep pulls 1.1.2;
# pin the exact-1.1 hackage revision that stack itself recommends.
echo '- magic-1.1@sha256:3a31ca1c49fa5f6a857f647471739bd240a6020af6ae43e71fb72201fc482fa2,928' >> stack.yaml

- name: stack setup
run: stack setup
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/build-macos.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,9 @@ jobs:
- name: Enable building with magic
run: |
perl -pli -e 's/magicmime: false/magicmime: true/' stack.yaml
# lts-24 caps `magic` at 1.1 while some transitive dep pulls 1.1.2;
# pin the exact-1.1 hackage revision that stack itself recommends.
echo '- magic-1.1@sha256:3a31ca1c49fa5f6a857f647471739bd240a6020af6ae43e71fb72201fc482fa2,928' >> stack.yaml

- name: stack setup
run: stack setup
Expand Down Expand Up @@ -202,7 +205,6 @@ jobs:
matrix:
flavor: ["normal", "crippled-tmp", "custom-config1"]
os: [macos-15-intel]
include: [{"flavor": "normal", "os": "macos-latest-large"}]
fail-fast: false
steps:
- name: Checkout this repository
Expand Down
7 changes: 5 additions & 2 deletions .github/workflows/build-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ jobs:
- name: Enable building with magic
run: |
perl -pli -e 's/magicmime: false/magicmime: true/' stack.yaml
# lts-24 caps `magic` at 1.1 while some transitive dep pulls 1.1.2;
# pin the exact-1.1 hackage revision that stack itself recommends.
echo '- magic-1.1@sha256:3a31ca1c49fa5f6a857f647471739bd240a6020af6ae43e71fb72201fc482fa2,928' >> stack.yaml

- name: Set UPGRADE_LOCATION
run: |
Expand Down Expand Up @@ -246,7 +249,7 @@ jobs:
- name: Install git-annex package
shell: powershell
run: |
./git-annex-installer_*.exe /S
Start-Process -FilePath (Get-Item ./git-annex-installer_*.exe).FullName -ArgumentList '/S' -Wait -NoNewWindow

- name: Check that magic files are installed
run: |
Expand Down Expand Up @@ -352,7 +355,7 @@ jobs:
- name: Install git-annex package
shell: powershell
run: |
./git-annex-installer_*.exe /S
Start-Process -FilePath (Get-Item ./git-annex-installer_*.exe).FullName -ArgumentList '/S' -Wait -NoNewWindow

- name: Define test host alias
shell: cmd
Expand Down
18 changes: 12 additions & 6 deletions .github/workflows/template/build-{{ostype}}.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ jobs:
- name: Enable building with magic
run: |
perl -pli -e 's/magicmime: false/magicmime: true/' stack.yaml
# lts-24 caps `magic` at 1.1 while some transitive dep pulls 1.1.2;
# pin the exact-1.1 hackage revision that stack itself recommends.
echo '- magic-1.1@sha256:3a31ca1c49fa5f6a857f647471739bd240a6020af6ae43e71fb72201fc482fa2,928' >> stack.yaml

- name: stack setup
run: stack setup
Expand Down Expand Up @@ -234,6 +237,9 @@ jobs:
- name: Enable building with magic
run: |
perl -pli -e 's/magicmime: false/magicmime: true/' stack.yaml
# lts-24 caps `magic` at 1.1 while some transitive dep pulls 1.1.2;
# pin the exact-1.1 hackage revision that stack itself recommends.
echo '- magic-1.1@sha256:3a31ca1c49fa5f6a857f647471739bd240a6020af6ae43e71fb72201fc482fa2,928' >> stack.yaml

- name: Set UPGRADE_LOCATION
run: |
Expand Down Expand Up @@ -286,7 +292,7 @@ jobs:

{% endif %}
- name: Upload packages
uses: actions/upload-artifact@v6
uses: actions/upload-artifact@v7
with:
name: {{artifact_basename}}_${{ steps.build-version.outputs.version }}
path: |
Expand Down Expand Up @@ -372,7 +378,7 @@ jobs:
- name: Send e-mail on failed run
if: failure() && contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name)
# freeze to v17
uses: dawidd6/action-send-mail@6e71c855c9a091d80a519621b9fd3e8d252ca40c
uses: dawidd6/action-send-mail@42942bc2f8fba4e611b459a018967a6a7c78c68c
with:
server_address: ${{ secrets.NOTIFY_SMTP_HOST }}
server_port: ${{ secrets.NOTIFY_SMTP_PORT }}
Expand Down Expand Up @@ -424,7 +430,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download git-annex package
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
name: {{artifact_basename}}_${{ needs.build-package.outputs.build-version }}

Expand Down Expand Up @@ -544,7 +550,7 @@ jobs:
- name: Send e-mail on failed run
if: failure() && contains(fromJSON('["schedule", "workflow_dispatch"]'), github.event_name)
# freeze to v17
uses: dawidd6/action-send-mail@6e71c855c9a091d80a519621b9fd3e8d252ca40c
uses: dawidd6/action-send-mail@42942bc2f8fba4e611b459a018967a6a7c78c68c
with:
server_address: ${{ secrets.NOTIFY_SMTP_HOST }}
server_port: ${{ secrets.NOTIFY_SMTP_PORT }}
Expand Down Expand Up @@ -584,7 +590,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download git-annex package
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
name: {{artifact_basename}}_${{ needs.build-package.outputs.build-version }}

Expand Down Expand Up @@ -645,7 +651,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Download git-annex package
uses: actions/download-artifact@v7
uses: actions/download-artifact@v8
with:
name: {{artifact_basename}}_${{ needs.build-package.outputs.build-version }}

Expand Down
13 changes: 9 additions & 4 deletions .github/workflows/template/specs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,12 @@
# TODO: Add "crippled-home" back in once
# <https://git-annex.branchable.com/bugs/gets_stuck_in_Remote_Tests___40____63____41___while_running_on_OSX_with_HOME_on_crippled_FS/?updated>
# is fixed
test_annex_include:
- flavor: normal
os: macos-latest-large
# macos-latest-large is a paid larger-Intel runner class; jobs get blocked
# on billing. Since macos-15-intel already provides Intel coverage,
# disable this extra include until billing is sorted.
# test_annex_include:
# - flavor: normal
# os: macos-latest-large
artifact_basename: git-annex-macos-dmg
artifact_install_steps:
- hdiutil attach git-annex_*.dmg
Expand Down Expand Up @@ -67,7 +70,9 @@
test_annex_flavors: [normal, custom-config1]
artifact_basename: git-annex-windows-installer
artifact_install_steps:
- ./git-annex-installer_*.exe /S
# -Wait is required because NSIS silent installers fork and the parent
# returns immediately — without it the next step may race the copy.
- Start-Process -FilePath (Get-Item ./git-annex-installer_*.exe).FullName -ArgumentList '/S' -Wait -NoNewWindow
test_datalad: true
# TODO: reenable -- was hanging on test step
# see https://github.com/datalad/datalad-extensions/pull/54
Loading