From 3ab2a5e4b7ed96f75ed90072b398e78deea682ad Mon Sep 17 00:00:00 2001 From: Adam Dinwoodie Date: Wed, 10 Feb 2021 15:08:36 +0000 Subject: [PATCH] Initial commit of rewritten Cygport file Also adds various Git and GitHub paraphernalia. --- .github/workflows/ci.yml | 76 ++++++++++++++++++++++++++++++++++++++++ .gitignore | 2 ++ .mailmap | 2 ++ asciidoc.cygport | 39 +++++++++++---------- build-requires.txt | 9 +++++ 5 files changed, 109 insertions(+), 19 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .gitignore create mode 100644 .mailmap create mode 100644 build-requires.txt diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..2ccc26b --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,76 @@ +name: CI +on: [push, pull_request] +jobs: + ci: + runs-on: windows-latest + steps: + - name: Install Cygwin Git + uses: egor-tensin/setup-cygwin@v2 + with: + packages: git + - name: Checkout + uses: actions/checkout@v2 + - name: Load packages to install + id: cyg-package-list + run: | + $pkgs = Get-Content -Path .\build-requires.txt + echo "::set-output name=packages::$pkgs" + - name: Install Cygwin build requirements + uses: egor-tensin/setup-cygwin@v2 + with: + packages: ${{ steps.cyg-package-list.outputs.packages }} + - name: Generate cygcheck output + run: | + C:\tools\cygwin\bin\bash.exe -c 'cygcheck -srv >/var/log/cygcheck.out' + if: always() + - name: Store Chocolatey logs + uses: actions/upload-artifact@v2 + with: + name: choco-logs + path: 'C:\ProgramData\chocolatey\logs\' + if: always() + - name: Store Cygwin logs + uses: actions/upload-artifact@v2 + with: + name: cygwin-logs + path: 'C:\tools\cygwin\var\log\' + if: always() + - name: Cygport download + run: | + C:\tools\cygwin\bin\bash.exe -c 'cygport asciidoc.cygport download' + - name: Cygport prep + run: | + C:\tools\cygwin\bin\bash.exe -c 'cygport asciidoc.cygport prep' + - name: Cygport compile + run: | + C:\tools\cygwin\bin\bash.exe -c 'cygport asciidoc.cygport compile' + - name: Cygport test + run: | + C:\tools\cygwin\bin\bash.exe -c 'cygport asciidoc.cygport test' + - name: Cygport install + run: | + C:\tools\cygwin\bin\bash.exe -c 'cygport asciidoc.cygport install' + - name: Cygport package + run: | + C:\tools\cygwin\bin\bash.exe -c 'cygport asciidoc.cygport package' + - name: Cygport upload + env: + MAINTAINER_KEY: ${{ secrets.MAINTAINER_KEY }} + run: | + C:\tools\cygwin\bin\bash.exe -c 'umask 0077 && mkdir -p ~/.ssh' + C:\tools\cygwin\bin\bash.exe -c 'umask 0077 && echo ""$MAINTAINER_KEY"" >~/.ssh/id_rsa' + C:\tools\cygwin\bin\bash.exe -c 'umask 0077 && echo ""cygwin.com,8.43.85.97 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBGqrxexIuyqmCVe33p1HuhUFzsXte5QZKb+BJlsRrvXOpUOJEW2S0kszyAiymeV7AXaYmHDKVRJpGVR+0ua0Xww="" >~/.ssh/known_hosts' + C:\tools\cygwin\bin\bash.exe -c 'SSH_KEY=~/.ssh/id_rsa cygport asciidoc.cygport upload' + if: startsWith(github.ref, 'refs/tags/v') + - name: Tar up build results + run: | + C:\tools\cygwin\bin\bash.exe -c 'tar -caf asciidoc.txz asciidoc-*-*.*/' + if: always() + - name: Store build results + uses: actions/upload-artifact@v2 + with: + name: build-results + path: | + asciidoc.txz + if-no-files-found: error + if: always() diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d1870fe --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +/*.tar.gz +/asciidoc-*/ diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..a62b03b --- /dev/null +++ b/.mailmap @@ -0,0 +1,2 @@ +Yaakov Selkowitz +Yaakov Selkowitz diff --git a/asciidoc.cygport b/asciidoc.cygport index 7b2457e..0394491 100644 --- a/asciidoc.cygport +++ b/asciidoc.cygport @@ -1,27 +1,28 @@ -inherit python +inherit python3 -NAME="asciidoc" -VERSION=8.6.9 -RELEASE=1 -CATEGORY="Text Doc" -SUMMARY="Text-based document generation tool" -DESCRIPTION="AsciiDoc is a text document format for writing short documents, -articles, books and UNIX man pages. AsciiDoc files can be translated to HTML -and DocBook markups using the asciidoc(1) command." -REQUIRES="dblatex docbook-xsl libxslt w3m xmlto" -HOMEPAGE="http://www.methods.co.nz/asciidoc/" -SRC_URI="mirror://sourceforge/asciidoc/${NAME}-${VERSION}.tar.gz" +NAME='asciidoc' +VERSION='9.0.5' +RELEASE='1' +CATEGORY='Text Doc' +SUMMARY='Text-based document generation' +DESCRIPTION='AsciiDoc is a text document format for writing notes, +documentation, articles, books, ebooks, slideshows, web pages, man pages and +blogs. AsciiDoc files can be translated to many formats including HTML, PDF, +EPUB, man page.' +HOMEPAGE='https://asciidoc.org/' +SRC_URI="https://github.com/asciidoc/asciidoc-py3/archive/${VERSION}.tar.gz + build-requires.txt" +SRC_DIR="asciidoc-py3-${PV}" -ARCH=noarch +ARCH='noarch' +BUILD_REQUIRES="$(tr '\n' ' '