Skip to content

Commit

Permalink
ci: try to make outputs work on windows and try to fix last mvs
Browse files Browse the repository at this point in the history
  • Loading branch information
stevana committed Nov 4, 2024
1 parent 846b87b commit 2e025e7
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ jobs:
- name: Install make (Windows only)
if: ${{ env.platform == 'x86_64-windows' }}
run: |
choco install make pkgconfiglite
choco install make
# Use Alpine container to get static binaries on Linux.
- name: Login to GitHub Container Registry (Linux only)
Expand Down Expand Up @@ -203,6 +203,7 @@ jobs:

- name: Check for version bump
id: version-bump
shell: bash
run: make bump

- name: Install binaries
Expand Down
13 changes: 8 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,12 @@ bump:
ifdef RELEASED_VERSION
ifneq ($(CABAL_VERSION),$(RELEASED_VERSION))
@echo "New version!"
ifeq ($(OS),MSYS_NT-10.0-20348)
echo "new-version=$(CABAL_VERSION)" >> $ENV:GITHUB_OUTPUT
else
# https://github.com/actions/runner/issues/2224
# ifeq ($(findstring MSYS_NT,$(OS)),MSYS_NT)
# echo "new-version=$(CABAL_VERSION)" >> $Env:GITHUB_OUTPUT
# else
echo "new-version=$(CABAL_VERSION)" >> $(GITHUB_OUTPUT)
endif
# endif
endif
endif
endif
Expand All @@ -96,7 +97,9 @@ release:
ls -R $(SPEX_BIN)
for dir in $$(ls $(SPEX_BIN)); do \
for bin in $$(ls $(SPEX_BIN)/$$dir); do \
mv $$bin $(SPEX_BIN)/$$(basename $$bin)-$(NEW_VERSION)-$$(basename $$dir); \
mv $(SPEX_BIN)/$$dir/$$bin \
$(SPEX_BIN)/$$(basename $$bin)-$(NEW_VERSION)-$$(basename $$dir); \
chmod 755 $(SPEX_BIN)/$$(basename $$bin)-$(NEW_VERSION)-$$(basename $$dir); \
done \
done
upx -q $(SPEX_BIN)/spex-*
Expand Down

0 comments on commit 2e025e7

Please sign in to comment.