diff options
Diffstat (limited to '.github/workflows/build-and-package.yaml')
| -rw-r--r-- | .github/workflows/build-and-package.yaml | 51 |
1 files changed, 24 insertions, 27 deletions
diff --git a/.github/workflows/build-and-package.yaml b/.github/workflows/build-and-package.yaml index 1f16285..bad9b88 100644 --- a/.github/workflows/build-and-package.yaml +++ b/.github/workflows/build-and-package.yaml @@ -2,11 +2,8 @@ name: BuildAndPackage on: push: - branches: master - paths-ignore: - - "*.md" - - "*.markdown" - - "mkdocs/**/*" + tags: + - "v*" # Remove comment in order to pre-release on a PR, to validate packaging flow pull_request: branches: master @@ -139,12 +136,12 @@ jobs: gem install fpm cp dist/fpm-config ~/.fpm - fpm -s dir -t deb --deb-use-file-permissions -p packages/linux/q-text-as-data-3.1.3-1.x86_64.deb --version 3.1.3 ./linux-q=/usr/bin/q USAGE.gz=/usr/share/man/man1/q.1.gz + fpm -s dir -t deb --deb-use-file-permissions -p packages/linux/q-text-as-data-3.1.4-1.x86_64.deb --version 3.1.4 ./linux-q=/usr/bin/q USAGE.gz=/usr/share/man/man1/q.1.gz - name: Upload DEB Package uses: actions/upload-artifact@v1.0.0 with: - name: q-text-as-data-3.1.3-1.x86_64.deb - path: packages/linux/q-text-as-data-3.1.3-1.x86_64.deb + name: q-text-as-data-3.1.4-1.x86_64.deb + path: packages/linux/q-text-as-data-3.1.4-1.x86_64.deb test-deb-packaging: runs-on: ubuntu-18.04 @@ -155,7 +152,7 @@ jobs: - name: Download DEB uses: actions/download-artifact@v2 with: - name: q-text-as-data-3.1.3-1.x86_64.deb + name: q-text-as-data-3.1.4-1.x86_64.deb - name: Install Python for Testing uses: actions/setup-python@v2 with: @@ -167,7 +164,7 @@ jobs: pip3 install -r test-requirements.txt - name: Test DEB Package Installation - run: ./dist/test-using-deb.sh ./q-text-as-data-3.1.3-1.x86_64.deb + run: ./dist/test-using-deb.sh ./q-text-as-data-3.1.4-1.x86_64.deb package-linux-rpm: needs: [test-linux, create-man] @@ -199,12 +196,12 @@ jobs: gem install fpm cp dist/fpm-config ~/.fpm - fpm -s dir -t rpm --rpm-use-file-permissions -p packages/linux/q-text-as-data-3.1.3.x86_64.rpm --version 3.1.3 ./linux-q=/usr/bin/q USAGE.gz=/usr/share/man/man1/q.1.gz + fpm -s dir -t rpm --rpm-use-file-permissions -p packages/linux/q-text-as-data-3.1.4.x86_64.rpm --version 3.1.4 ./linux-q=/usr/bin/q USAGE.gz=/usr/share/man/man1/q.1.gz - name: Upload RPM Package uses: actions/upload-artifact@v1.0.0 with: - name: q-text-as-data-3.1.3.x86_64.rpm - path: packages/linux/q-text-as-data-3.1.3.x86_64.rpm + name: q-text-as-data-3.1.4.x86_64.rpm + path: packages/linux/q-text-as-data-3.1.4.x86_64.rpm test-rpm-packaging: runs-on: ubuntu-18.04 @@ -215,9 +212,9 @@ jobs: - name: Download RPM uses: actions/download-artifact@v2 with: - name: q-text-as-data-3.1.3.x86_64.rpm + name: q-text-as-data-3.1.4.x86_64.rpm - name: Retest using RPM - run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.3.x86_64.rpm + run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.4.x86_64.rpm build-mac: runs-on: macos-11 @@ -308,7 +305,7 @@ jobs: export BRANCH_NAME=master # TODO temp, since template rendering action doesn't work in mac - cat .github/workflows/q.rb.brew-formula-template | sed 's/{{ .Q_VERSION }}/3.1.3/g' | sed "s/{{ .Q_BRANCH_NAME }}/${BRANCH_NAME}/g" > ./brew/q.rb + cat .github/workflows/q.rb.brew-formula-template | sed 's/{{ .Q_VERSION }}/3.1.4/g' | sed "s/{{ .Q_BRANCH_NAME }}/${BRANCH_NAME}/g" > ./brew/q.rb echo "Resulting formula:" cat ./brew/q.rb @@ -322,8 +319,8 @@ jobs: - name: Upload Executable uses: actions/upload-artifact@v1.0.0 with: - name: q--3.1.3_1.big_sur.bottle.tar.gz - path: ./q--3.1.3_1.big_sur.bottle.tar.gz + name: q--3.1.4_1.big_sur.bottle.tar.gz + path: ./q--3.1.4_1.big_sur.bottle.tar.gz # TODO auto-create PR to main homebrew-core # git clone https://github.com/harelba/homebrew-core.git @@ -340,7 +337,7 @@ jobs: - name: Download q bottle uses: actions/download-artifact@v2 with: - name: q--3.1.3_1.big_sur.bottle.tar.gz + name: q--3.1.4_1.big_sur.bottle.tar.gz - name: Test the created bottle run: | set -x -e @@ -349,7 +346,7 @@ jobs: WD=$(pwd) pushd /usr/local/Cellar - tar xvfz ${WD}/q--3.1.3_1.big_sur.bottle.tar.gz + tar xvfz ${WD}/q--3.1.4_1.big_sur.bottle.tar.gz popd brew link q @@ -459,17 +456,17 @@ jobs: # TODO Windows versions do not support the -beta postfix - export Q_MSI=./build/x86_64-pc-windows-msvc/release/msi_installer/q-text-as-data-3.1.3.msi + export Q_MSI=./build/x86_64-pc-windows-msvc/release/msi_installer/q-text-as-data-3.1.4.msi chmod 755 $Q_MSI mkdir -p packages/windows/ - cp $Q_MSI packages/windows/q-text-as-data-3.1.3.msi + cp $Q_MSI packages/windows/q-text-as-data-3.1.4.msi - name: Upload Windows MSI uses: actions/upload-artifact@v1.0.0 with: - name: q-text-as-data-3.1.3.msi - path: packages/windows/q-text-as-data-3.1.3.msi + name: q-text-as-data-3.1.4.msi + path: packages/windows/q-text-as-data-3.1.4.msi test-windows-packaging: needs: package-windows @@ -480,12 +477,12 @@ jobs: - name: Download Windows Package uses: actions/download-artifact@v2 with: - name: q-text-as-data-3.1.3.msi + name: q-text-as-data-3.1.4.msi - name: Test Install of MSI continue-on-error: true shell: powershell run: | - $process = Start-Process msiexec.exe -ArgumentList "/i q-text-as-data-3.1.3.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait + $process = Start-Process msiexec.exe -ArgumentList "/i q-text-as-data-3.1.4.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait $process.ExitCode gc msi-install.log @@ -494,7 +491,7 @@ jobs: continue-on-error: true shell: powershell run: | - $process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.3.msi /norestart /quiet" -PassThru -Wait + $process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.4.msi /norestart /quiet" -PassThru -Wait $process.ExitCode exit $process.ExitCode |