diff --git a/.github/workflows/release-workflow.yaml b/.github/workflows/release-workflow.yaml index 7e6be64a9..6546e62e3 100644 --- a/.github/workflows/release-workflow.yaml +++ b/.github/workflows/release-workflow.yaml @@ -24,6 +24,9 @@ jobs: make cleanall make docker-dist-source-wd make docker-dist-site-wd + ls -l + rm -rf dist && mkdir dist + mv duktape-*.tar.xz dist/ ls -l dist/ - name: Upload artifacts uses: actions/upload-artifact@v2 diff --git a/Makefile b/Makefile index 7f6950bad..83391c622 100644 --- a/Makefile +++ b/Makefile @@ -1226,25 +1226,25 @@ docker-clean: @echo "" @echo "Now run 'docker system prune' to free disk space." -.PHONY: docker-dist-src-master -docker-dist-src-master: +.PHONY: docker-dist-source-master +docker-dist-source-master: rm -f docker-input.zip docker-output.zip docker run --rm -i duktape-dist-ubuntu-18.04-x64 > docker-output.zip - unzip -t docker-output.zip ; true # avoid failure due to leading garbage + unzip -q -o docker-output.zip ; true # avoid failure due to leading garbage -.PHONY: docker-dist-src-wd -docker-dist-src-wd: +.PHONY: docker-dist-source-wd +docker-dist-source-wd: rm -f docker-input.zip docker-output.zip #git archive --format zip --output docker-input.zip HEAD zip -1 -q -r docker-input.zip . docker run --rm -i -e STDIN_ZIP=1 duktape-dist-ubuntu-18.04-x64 < docker-input.zip > docker-output.zip - unzip -t docker-output.zip ; true # avoid failure due to leading garbage + unzip -q -o docker-output.zip ; true # avoid failure due to leading garbage .PHONY: docker-dist-site-master docker-dist-site-master: rm -f docker-input.zip docker-output.zip docker run --rm -i duktape-site-ubuntu-18.04-x64 > docker-output.zip - unzip -t docker-output.zip ; true # avoid failure due to leading garbage + unzip -q -o docker-output.zip ; true # avoid failure due to leading garbage .PHONY: docker-dist-site-wd docker-dist-site-wd: @@ -1252,7 +1252,7 @@ docker-dist-site-wd: #git archive --format zip --output docker-input.zip HEAD zip -1 -q -r docker-input.zip . docker run --rm -i -e STDIN_ZIP=1 duktape-site-ubuntu-18.04-x64 < docker-input.zip > docker-output.zip - unzip -t docker-output.zip ; true # avoid failure due to leading garbage + unzip -q -o docker-output.zip ; true # avoid failure due to leading garbage .PHONY: docker-duk-wd docker-duk-wd: diff --git a/README.md b/README.md index ed3edf067..58c3c07cd 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ These are also **intended for Linux only**. For example: $ make docker-images # Equivalent of 'make dist', but runs inside a container. - $ make docker-dist-src-wd + $ make docker-dist-source-wd # Run a shell with /work/duktape containing a disposable master snapshot. $ make docker-shell-master