Skip to content

Commit

Permalink
cleanup build folder after release asset generation
Browse files Browse the repository at this point in the history
  • Loading branch information
mredolatti committed Jan 24, 2024
1 parent a3f43a1 commit ec42bee
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ jobs:
strategy:
matrix:
mode: [synchronizer, proxy]
fips-mode: [enabled, disabled]
steps:
- name: Login to Artifactory
uses: docker/login-action@v2
Expand All @@ -89,3 +90,6 @@ jobs:
file: docker/Dockerfile.${{ matrix.mode }}
push: true
tags: splitio-docker.jfrog.io/split-${{ matrix.mode }}:${{ env.VERSION }}
build-args: |
FIPS_MODE=${{ matrix.fips-mode }}
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ $(BUILD_FIPS)/install_split_%.bin: $(BUILD_FIPS)/split_%.zip
posix_execs := split_sync_linux split_sync_osx split_proxy_linux split_proxy_osx
windows_execs := split_sync_windows.exe split_proxy_windows.exe
execs := $(posix_execs) $(windows_execs)
.INTERMEDIATE: $(addprefix $(BUILD)/,$(execs))
.INTERMEDIATE: $(addprefix $(BUILD)/,$(execs)) $(addprefix $(BUILD_FIPS)/,$(execs))

# regular binaries recipe
$(addprefix $(BUILD)/,$(execs)): $(BUILD)/split_%: $(sources) go.sum
Expand Down Expand Up @@ -217,10 +217,10 @@ define copy-release-binaries
for f in $^; do \
if [[ $$(dirname "$$f") == $(BUILD) ]]; then \
cp $$f $@/$(version)/$$(basename "$${f%.*}")_$(version).$${f##*.}; \
cp $$f $@; \
mv $$f $@; \
elif [[ $$(dirname "$$f") == $(BUILD_FIPS) ]]; then \
cp $$f @/$(version)/$$(basename "$${f%.*}")_fips_$(version).$${f##*.}; \
cp $$f $@/$$(basename "$${f%.*}")_fips.$${f##*.}; \
cp $$f $@/$(version)/$$(basename "$${f%.*}")_fips_$(version).$${f##*.}; \
mv $$f $@/$$(basename "$${f%.*}")_fips.$${f##*.}; \
fi \
done
endef
Expand Down

0 comments on commit ec42bee

Please sign in to comment.