From cc991c2a1479dc4ab1be0580dc735a2b93fccc5c Mon Sep 17 00:00:00 2001 From: Stevan Andjelkovic Date: Tue, 19 Nov 2024 10:59:22 +0100 Subject: [PATCH] ci: reenable mac and win builds --- .github/workflows/main.yaml | 3 +-- Makefile | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml index 8b23bb4..a08e210 100644 --- a/.github/workflows/main.yaml +++ b/.github/workflows/main.yaml @@ -25,8 +25,7 @@ jobs: strategy: fail-fast: false matrix: - # os: [ubuntu-24.04, macos-15, windows-2022] - os: [ubuntu-24.04] + os: [ubuntu-24.04, macos-15, windows-2022] ghc-version: ['9.6.6'] cabal-version: ['3.12.1.0'] env: diff --git a/Makefile b/Makefile index 7f6e489..c3b6655 100644 --- a/Makefile +++ b/Makefile @@ -163,9 +163,9 @@ release: --tag ghcr.io/spex-lang/spex:$(NEW_VERSION) \ --file Dockerfile.app . ifeq ($(GITHUB_ACTIONS),true) + docker push ghcr.io/spex-lang/spex:$(NEW_VERSION) gh release create --prerelease --notes-file=CHANGELOG.md \ "v$(NEW_VERSION)" $(SPEX_BIN)/spex* - docker push ghcr.io/spex-lang/spex:$(NEW_VERSION) else @echo Running locally, skipping automatic release... endif