Skip to content

Commit bbf7167

Browse files
Removes last of windows remnants
Signed-off-by: Adrian Cole <adrian@tetrate.io>
1 parent 3d2f9e8 commit bbf7167

5 files changed

Lines changed: 1 addition & 18 deletions

File tree

.github/workflows/Dockerfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,9 @@ ARG arch_lc=arm64
5555

5656
FROM base-${TARGETARCH}
5757

58-
# While it is possible to build osslsigncode on CentOS, msitools can't due to
59-
# missing libgcab1-devel package. The workaround is to `make dist` with Ubuntu.
6058
ARG centos_packages="make sudo"
6159
# Ubuntu runs check, dist, and e2e, so needs more packages.
62-
ARG ubuntu_packages="make sudo curl git zip osslsigncode"
60+
ARG ubuntu_packages="make sudo curl git"
6361
RUN if [ -f /etc/centos-release ]; then \
6462
# Use Dandified YUM on CentOS >=8.
6563
dnf="dnf -qy" && ${dnf} install ${centos_packages} && ${dnf} clean all; \

.github/workflows/commit.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ on:
1919
- '**/*.md'
2020
- 'site/**'
2121
- 'netlify.toml'
22-
- 'packaging/icon@48w.ico'
2322
# workflow_dispatch will let us manually trigger the workflow from GitHub actions dashboard.
2423
# For example, you can try to build a branch without raising a pull request.
2524
# See https://docs.github.com/en/free-pro-team@latest/actions/managing-workflow-runs/manually-running-a-workflow

.github/workflows/packaging.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,13 @@ on:
1010
branches: master
1111
paths:
1212
- 'packaging/nfpm/*'
13-
- 'packaging/icon@48w.ico'
1413
- '.github/workflows/packaging.yaml'
1514
- 'Makefile'
1615
- 'Tools.mk'
1716
pull_request: # We also run tests on pull requests targeted at the master branch
1817
branches: master
1918
paths:
2019
- 'packaging/nfpm/*'
21-
- 'packaging/icon@48w.ico'
2220
- '.github/workflows/packaging.yaml'
2321
- 'Makefile'
2422
- 'Tools.mk'

Makefile

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,6 @@ dist/func-e_$(VERSION)_%.tar.gz: build/func-e_%/func-e
107107
@tar -C $(<D) -cpzf $@ $(<F)
108108
@printf "$(ansi_format_bright)" tar.gz "ok"
109109

110-
dist/func-e_$(VERSION)_%.zip: build/func-e_%/func-e.exe.signed
111-
@printf "$(ansi_format_dark)" zip "zipping $@"
112-
@mkdir -p $(@D)
113-
@zip -qj $@ $(<:.signed=)
114-
@printf "$(ansi_format_bright)" zip "ok"
115-
116110
# Default to a dummy version, which is always lower than a real release
117111
pkg_version := v$(VERSION:dev=0.0.1)
118112

@@ -139,14 +133,8 @@ $(rpm_aarch64): $(call pkg_binary,arm64) $(pkg_inputs)
139133
dist/func-e_$(VERSION)_linux_%.deb: $(call pkg_binary,%) $(pkg_inputs)
140134
$(call nfpm-pkg,$<,"deb",$@)
141135

142-
# msi-arch is a macro so we can detect it based on the file naming convention
143-
msi-arch = $(if $(findstring amd64,$1),x64,arm64)
144-
# Default to a dummy version, which is always lower than a real release
145-
msi_version := $(VERSION:dev=0.0.1)
146-
147136
# Archives are tar.gz,
148137
all_archives := $(all_platforms:%=dist/func-e_$(VERSION)_%.tar.gz)
149-
archives := $(all_platforms:%=dist/func-e_$(VERSION)_%.tar.gz)
150138
checksums := dist/func-e_$(VERSION)_checksums.txt
151139

152140
# Darwin doesn't have sha256sum. See https://github.com/actions/virtual-environments/issues/90

packaging/icon@48w.ico

-9.62 KB
Binary file not shown.

0 commit comments

Comments
 (0)