diff options
| author | Matthew Peveler <matt.peveler@gmail.com> | 2020-06-02 01:09:14 -0400 |
|---|---|---|
| committer | Matthew Peveler <matt.peveler@gmail.com> | 2020-06-02 01:09:14 -0400 |
| commit | 2037ae1cbf2858bbd3e567955f999b74a2c4398c (patch) | |
| tree | 312d893f1dd5c6795df122effaa6969c48bb7c4d | |
| parent | 3001d22e806181ec029931aef0e25c15f4ac8ee0 (diff) | |
| download | asciidoc-py3-2037ae1cbf2858bbd3e567955f999b74a2c4398c.tar.gz | |
fix release action workflow for next release
Signed-off-by: Matthew Peveler <matt.peveler@gmail.com>
| -rw-r--r-- | .github/workflows/release.yml | 6 | ||||
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Dockerfile | 3 | ||||
| -rw-r--r-- | Makefile.in | 5 |
4 files changed, 9 insertions, 8 deletions
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3089ccd..38d3164 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -13,7 +13,7 @@ jobs: run: docker build . -t asciidoc - name: Build distributions - run: docker run --rm -v $(pwd):/srv/asciidoc asciidoc /bin/bash -c "make dist" + run: docker run --rm -v $(pwd)/build:/srv/asciidoc/build asciidoc /bin/bash -c "make dist" - name: Upload asciidoc-${{ github.event.release.tag_name }}.zip id: upload-release-asset-zip @@ -22,7 +22,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ github.event.release.upload_url }} - asset_path: ./asciidoc-${{ github.event.release.tag_name }}.zip + asset_path: ./build/asciidoc-${{ github.event.release.tag_name }}.zip asset_name: asciidoc-${{ github.event.release.tag_name }}.zip asset_content_type: application/zip @@ -33,6 +33,6 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: upload_url: ${{ github.event.release.upload_url }} - asset_path: ./asciidoc-${{ github.event.release.tag_name }}.tar.gz + asset_path: ./build/asciidoc-${{ github.event.release.tag_name }}.tar.gz asset_name: asciidoc-${{ github.event.release.tag_name }}.tar.gz asset_content_type: application/gzip @@ -32,5 +32,4 @@ MANIFEST /tags /gh-pages/ -/*.zip -/*.tar.gz +build/ @@ -33,7 +33,8 @@ RUN mkdir /usr/share/man/man1/ \ time \ texlive-latex-base \ unzip \ - && apt-get clean && rm -rf /var/lib/apt/lists/* + zip \ + && apt-get clean && rm -rf /var/lib/apt/lists/* \ && autoconf \ && ./configure diff --git a/Makefile.in b/Makefile.in index 4b10bb2..399b342 100644 --- a/Makefile.in +++ b/Makefile.in @@ -262,8 +262,9 @@ MANIFEST: MANIFEST.in ## dist: creates the zip and tarball for release .PHONY: dist dist: vers_update manpages MANIFEST - tar -czf asciidoc-$(ASCIIDOCVERSION).tar.gz -T MANIFEST - zip asciidoc-$(ASCIIDOCVERSION).zip -@ < MANIFEST + @mkdir -p build + tar -czf build/asciidoc-$(ASCIIDOCVERSION).tar.gz -T MANIFEST + zip build/asciidoc-$(ASCIIDOCVERSION).zip -@ < MANIFEST ##. ## test: run the asciidoc test suite |