Skip to content

Commit

Permalink
Always use latest cacert.pem from curl.se
Browse files Browse the repository at this point in the history
  • Loading branch information
ronaldtse committed Dec 7, 2021
1 parent 39683a0 commit c190486
Show file tree
Hide file tree
Showing 5 changed files with 483 additions and 4,107 deletions.
9 changes: 7 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,21 @@ TEST_PROCESSORS ?= iso cc iec un m3aawg jcgm csa bipm iho ogc itu ietf
BUILD_DIR := build

rubyc:
curl -L https://github.com/metanorma/ruby-packer/releases/download/v0.6.1/rubyc-$(PLATFORM)-x64 > ./rubyc && chmod +x rubyc
curl -L https://github.com/metanorma/ruby-packer/releases/download/v0.6.1/rubyc-$(PLATFORM)-x64 \
-o $@ && \
chmod +x rubyc

$(BUILD_DIR)/metanorma: rubyc
$(BUILD_DIR)/metanorma: rubyc vendor/cacert.pem.mozilla
ifeq (,$(wildcard $(BUILD_DIR)/metanorma))
./bin/build.sh $(BUILD_DIR)
endif
ifeq ($(UNAME_S),Linux)
strip $(BUILD_DIR)/metanorma
endif

vendor/cacert.pem.mozilla:
curl -L https://curl.se/ca/cacert.pem -o $@

test: $(BUILD_DIR)/metanorma
parallel -j+0 --joblog parallel.log --eta make test-flavor TEST_FLAVOR={} "&>" test_{}.log ::: $(TEST_PROCESSORS); \
parallel -j+0 --joblog parallel.log --resume-failed 'echo ---- {} ----; tail -15 test_{}.log; echo ---- --- ----; exit 1' ::: $(TEST_PROCESSORS)
Expand Down
3 changes: 3 additions & 0 deletions Makefile.win
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ build/Gemfile.lock: build/Gemfile | build
build/metanorma: bin/metanorma | build
cp $< $@

build/cacert.pem.mozilla:
curl -L https://curl.se/ca/cacert.pem > $@

build/metanorma.exe: build/cacert.pem.mozilla build/metanorma.ico build/metanorma build/Gemfile build/Gemfile.lock
ifeq (,$(wildcard build/metanorma.exe))
gem update --system
Expand Down
Loading

0 comments on commit c190486

Please sign in to comment.