Skip to content

Commit

Permalink
Release workflow fixes for v2-maintenance
Browse files Browse the repository at this point in the history
  • Loading branch information
svaarala committed Feb 11, 2022
1 parent d00bee4 commit a9b65f7
Show file tree
Hide file tree
Showing 4 changed files with 21 additions and 17 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/release-workflow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 9 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1185,7 +1185,7 @@ massif-arcfour: massif-test-dev-arcfour
.PHONY: docker-prepare
docker-prepare:
cd docker && for subdir in duktape-*; do \
if [ -f ~/.gitconfig ]; then cp ~/.gitconfig $$subdir/gitconfig; else touch docker/$$subdir/gitconfig; fi; \
if [ -f ~/.gitconfig ]; then cp ~/.gitconfig $$subdir/gitconfig; else touch $$subdir/gitconfig; fi; \
cp prepare_repo.sh $$subdir/; \
done

Expand Down Expand Up @@ -1226,33 +1226,33 @@ 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:
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-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:
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions docker/duktape-base-ubuntu-18.04-x64/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -76,20 +76,21 @@ RUN echo "=== Repo snapshots ===" && \
# image needs master. Copy it from the repo snapshot, but leave the snapshot
# intact. Try to minimize network traffic by pulling in some dependencies into
# the image.
#
# MINIMIZED for v2-maintenance.
RUN echo "=== Prepare duktape-prep repo ===" && \
cp -r repo-snapshots/duktape duktape-prep && \
cp -r repo-snapshots/duktape-releases duktape-prep/duktape-releases && \
cd duktape-prep && \
make runtestsdeps linenoise UglifyJS2 && \
make duktape-releases lz-string jquery-1.11.2.js && \
make luajs underscore lodash bluebird.js closure-compiler && \
make clean

# Initialize Emscripten cached bytecode files.
RUN echo "=== Prepare Emscripten cached bytecode files ===" && \
cp -r duktape-prep /tmp/duktape-emcc-init && \
bash -c '. emsdk/emsdk_env.sh && cd /tmp/duktape-emcc-init && make emscriptenluatest dukweb.js' && \
rm -rf /tmp/duktape-emcc-init /tmp/duk-emcc*
#
# MINIMIZED for v2-maintenance.
#RUN echo "=== Prepare Emscripten cached bytecode files ===" && \
# cp -r duktape-prep /tmp/duktape-emcc-init && \
# bash -c '. emsdk/emsdk_env.sh && cd /tmp/duktape-emcc-init && make build/dukweb.js' && \
# rm -rf /tmp/duktape-emcc-init /tmp/duk-emcc*

# Dump some versions.
RUN echo "=== Versions ===" && \
Expand Down

0 comments on commit a9b65f7

Please sign in to comment.