summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarel Ben-Attia <harelba@gmail.com>2021-11-26 17:19:40 +0200
committerHarel Ben-Attia <harelba@gmail.com>2021-11-26 17:19:40 +0200
commita6617e45bea57ce437ae5f1a64ae1d2e9fb585ae (patch)
tree05703c40c2e20a96016bdb4d498eef06a948a9bb
parent19bfff3704842aa3cf29b2136c69ca8b0c1856ee (diff)
replace to continue-on-error, so release will be created... + bump to 3.1.6v3.1.6
-rw-r--r--.github/workflows/build-and-package.yaml48
-rw-r--r--.github/workflows/q.rb.brew-formula-template2
-rw-r--r--README.markdown2
-rwxr-xr-xbin/q.py2
-rw-r--r--mkdocs/docs/index.md12
-rw-r--r--pyoxidizer.bzl2
-rw-r--r--setup.py2
7 files changed, 35 insertions, 35 deletions
diff --git a/.github/workflows/build-and-package.yaml b/.github/workflows/build-and-package.yaml
index 2ba23ad..6a64a52 100644
--- a/.github/workflows/build-and-package.yaml
+++ b/.github/workflows/build-and-package.yaml
@@ -136,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.5-1.x86_64.deb --version 3.1.5 ./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.6-1.x86_64.deb --version 3.1.6 ./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.5-1.x86_64.deb
- path: packages/linux/q-text-as-data-3.1.5-1.x86_64.deb
+ name: q-text-as-data-3.1.6-1.x86_64.deb
+ path: packages/linux/q-text-as-data-3.1.6-1.x86_64.deb
test-deb-packaging:
runs-on: ubuntu-18.04
@@ -152,7 +152,7 @@ jobs:
- name: Download DEB
uses: actions/download-artifact@v2
with:
- name: q-text-as-data-3.1.5-1.x86_64.deb
+ name: q-text-as-data-3.1.6-1.x86_64.deb
- name: Install Python for Testing
uses: actions/setup-python@v2
with:
@@ -164,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.5-1.x86_64.deb
+ run: ./dist/test-using-deb.sh ./q-text-as-data-3.1.6-1.x86_64.deb
package-linux-rpm:
needs: [test-linux, create-man]
@@ -196,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.5.x86_64.rpm --version 3.1.5 ./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.6.x86_64.rpm --version 3.1.6 ./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.5.x86_64.rpm
- path: packages/linux/q-text-as-data-3.1.5.x86_64.rpm
+ name: q-text-as-data-3.1.6.x86_64.rpm
+ path: packages/linux/q-text-as-data-3.1.6.x86_64.rpm
test-rpm-packaging:
runs-on: ubuntu-18.04
@@ -212,9 +212,9 @@ jobs:
- name: Download RPM
uses: actions/download-artifact@v2
with:
- name: q-text-as-data-3.1.5.x86_64.rpm
+ name: q-text-as-data-3.1.6.x86_64.rpm
- name: Retest using RPM
- run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.5.x86_64.rpm
+ run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.6.x86_64.rpm
build-mac:
runs-on: macos-11
@@ -290,7 +290,7 @@ jobs:
package-mac:
# create-man is not needed, as it's generated inside the brew formula independently
needs: [test-mac]
- if: ${{false}}
+ continue-on-error: true
runs-on: macos-11
steps:
- name: Checkout
@@ -306,7 +306,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.5/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.6/g' | sed "s/{{ .Q_BRANCH_NAME }}/${BRANCH_NAME}/g" > ./brew/q.rb
echo "Resulting formula:"
cat ./brew/q.rb
@@ -320,8 +320,8 @@ jobs:
- name: Upload Executable
uses: actions/upload-artifact@v1.0.0
with:
- name: q--3.1.5_1.big_sur.bottle.tar.gz
- path: ./q--3.1.5_1.big_sur.bottle.tar.gz
+ name: q--3.1.6_1.big_sur.bottle.tar.gz
+ path: ./q--3.1.6_1.big_sur.bottle.tar.gz
# TODO auto-create PR to main homebrew-core
# git clone https://github.com/harelba/homebrew-core.git
@@ -331,7 +331,7 @@ jobs:
test-mac-packaging:
needs: package-mac
- if: ${{false}}
+ continue-on-error: true
runs-on: macos-11
steps:
- name: Checkout
@@ -339,7 +339,7 @@ jobs:
- name: Download q bottle
uses: actions/download-artifact@v2
with:
- name: q--3.1.5_1.big_sur.bottle.tar.gz
+ name: q--3.1.6_1.big_sur.bottle.tar.gz
- name: Test the created bottle
run: |
set -x -e
@@ -348,7 +348,7 @@ jobs:
WD=$(pwd)
pushd /usr/local/Cellar
- tar xvfz ${WD}/q--3.1.5_1.big_sur.bottle.tar.gz
+ tar xvfz ${WD}/q--3.1.6_1.big_sur.bottle.tar.gz
popd
brew link q
@@ -458,17 +458,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.5.msi
+ export Q_MSI=./build/x86_64-pc-windows-msvc/release/msi_installer/q-text-as-data-3.1.6.msi
chmod 755 $Q_MSI
mkdir -p packages/windows/
- cp $Q_MSI packages/windows/q-text-as-data-3.1.5.msi
+ cp $Q_MSI packages/windows/q-text-as-data-3.1.6.msi
- name: Upload Windows MSI
uses: actions/upload-artifact@v1.0.0
with:
- name: q-text-as-data-3.1.5.msi
- path: packages/windows/q-text-as-data-3.1.5.msi
+ name: q-text-as-data-3.1.6.msi
+ path: packages/windows/q-text-as-data-3.1.6.msi
test-windows-packaging:
needs: package-windows
@@ -479,12 +479,12 @@ jobs:
- name: Download Windows Package
uses: actions/download-artifact@v2
with:
- name: q-text-as-data-3.1.5.msi
+ name: q-text-as-data-3.1.6.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.5.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait
+ $process = Start-Process msiexec.exe -ArgumentList "/i q-text-as-data-3.1.6.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait
$process.ExitCode
gc msi-install.log
@@ -493,7 +493,7 @@ jobs:
continue-on-error: true
shell: powershell
run: |
- $process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.5.msi /norestart /quiet" -PassThru -Wait
+ $process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.6.msi /norestart /quiet" -PassThru -Wait
$process.ExitCode
exit $process.ExitCode
diff --git a/.github/workflows/q.rb.brew-formula-template b/.github/workflows/q.rb.brew-formula-template
index db9c963..ca53278 100644
--- a/.github/workflows/q.rb.brew-formula-template
+++ b/.github/workflows/q.rb.brew-formula-template
@@ -4,7 +4,7 @@
class Q < Formula
desc "Run SQL directly on CSV or TSV files"
homepage "https://harelba.github.io/q/"
- url "https://github.com/harelba/q/archive/v3.1.5.tar.gz"
+ url "https://github.com/harelba/q/archive/v3.1.6.tar.gz"
sha256 "0f4656b19087332d5113dd38907b50d70c55a57b3e97f810b8090132412dc9fb"
diff --git a/README.markdown b/README.markdown
index c207f73..55cbe73 100644
--- a/README.markdown
+++ b/README.markdown
@@ -39,7 +39,7 @@ $ q "select count(*) from some_db.sqlite3:::albums a left join another_db.sqlite
Detailed examples are in [here](http://harelba.github.io/q/#examples)
## Installation.
-**New Major Version `3.1.5` is out with a lot of significant additions.**
+**New Major Version `3.1.6` is out with a lot of significant additions.**
Instructions for all OSs are [here](http://harelba.github.io/q/#installation).
diff --git a/bin/q.py b/bin/q.py
index ddb6188..c6d282b 100755
--- a/bin/q.py
+++ b/bin/q.py
@@ -35,7 +35,7 @@ from collections import OrderedDict
from sqlite3.dbapi2 import OperationalError
from uuid import uuid4
-q_version = '3.1.5'
+q_version = '3.1.6'
#__all__ = [ 'QTextAsData' ]
diff --git a/mkdocs/docs/index.md b/mkdocs/docs/index.md
index 426189c..ddec35e 100644
--- a/mkdocs/docs/index.md
+++ b/mkdocs/docs/index.md
@@ -69,12 +69,12 @@ Download the tool using the links in the [installation](#installation) below and
| Format | Instructions | Comments |
:---|:---|:---|
-|[OSX](https://github.com/harelba/q/releases/download/v3.1.5/macos-q)|`brew install` will install the previous `2.0.19` for now, until homebrew approves the new version. In the mean time, you can download the new version executable from the link, `chmod +x` it and then run. You might need to run it the first time from Finder using Right-Click -> Open, and then click the Open button. After the first time, it will run from the command line without any issues. |A man page is available, just run `man q`||
-|[RPM Package](https://github.com/harelba/q/releases/download/v3.1.5/q-text-as-data-3.1.5.x86_64.rpm)| run `rpm -ivh <package-filename>` or `rpm -U <package-filename>` if you already have an older version of q.| A man page is available for this release. Just enter `man q`.|
-|[DEB Package](https://github.com/harelba/q/releases/download/v3.1.5/q-text-as-data-3.1.5-1.x86_64.deb)| Run `sudo dpkg -i <package-filename>`|A man page is available for this release. Just enter `man q`. Some installations don't install the man page properly for some reason. I'll fix this soon|
-|[Windows Installer](https://github.com/harelba/q/releases/download/v3.1.5/q-text-as-data-3.1.5.msi)|Run the installer executable and hit next next next... q.exe will be added to the PATH so you can access it everywhere.|Windows doesn't update the PATH retroactively for open windows, so you'll need to open a new `cmd`/`bash` window after the installation is done.|
-|[Source tar.gz](https://github.com/harelba/q/archive/refs/tags/v3.1.5.tar.gz)|Full source file tree for latest stable version. Note that q.py cannot be used directly anymore, as it requires python dependencies||
-|[Source zip](https://github.com/harelba/q/archive/refs/tags/v3.1.5.zip)|Full source file tree for the latest stable version. Note that q.py cannot be used directly anymore, as it requires python dependencies||
+|[OSX](https://github.com/harelba/q/releases/download/v3.1.6/macos-q)|`brew install` will install the previous `2.0.19` for now, until homebrew approves the new version. In the mean time, you can download the new version executable from the link, `chmod +x` it and then run. You might need to run it the first time from Finder using Right-Click -> Open, and then click the Open button. After the first time, it will run from the command line without any issues. |A man page is available, just run `man q`||
+|[RPM Package](https://github.com/harelba/q/releases/download/v3.1.6/q-text-as-data-3.1.6.x86_64.rpm)| run `rpm -ivh <package-filename>` or `rpm -U <package-filename>` if you already have an older version of q.| A man page is available for this release. Just enter `man q`.|
+|[DEB Package](https://github.com/harelba/q/releases/download/v3.1.6/q-text-as-data-3.1.6-1.x86_64.deb)| Run `sudo dpkg -i <package-filename>`|A man page is available for this release. Just enter `man q`. Some installations don't install the man page properly for some reason. I'll fix this soon|
+|[Windows Installer](https://github.com/harelba/q/releases/download/v3.1.6/q-text-as-data-3.1.6.msi)|Run the installer executable and hit next next next... q.exe will be added to the PATH so you can access it everywhere.|Windows doesn't update the PATH retroactively for open windows, so you'll need to open a new `cmd`/`bash` window after the installation is done.|
+|[Source tar.gz](https://github.com/harelba/q/archive/refs/tags/v3.1.6.tar.gz)|Full source file tree for latest stable version. Note that q.py cannot be used directly anymore, as it requires python dependencies||
+|[Source zip](https://github.com/harelba/q/archive/refs/tags/v3.1.6.zip)|Full source file tree for the latest stable version. Note that q.py cannot be used directly anymore, as it requires python dependencies||
I will add packages for additional Linux Distributions if there's demand for it. If you're interested in another Linux distribution, please ping me. It's relatively easy to add new ones with the new packaging flow.
diff --git a/pyoxidizer.bzl b/pyoxidizer.bzl
index 840f174..da79ba2 100644
--- a/pyoxidizer.bzl
+++ b/pyoxidizer.bzl
@@ -61,7 +61,7 @@ def make_msi(exe):
# The name of your application.
"q-text-as-data",
# The version of your application.
- "3.1.5",
+ "3.1.6",
# The author/manufacturer of your application.
"Harel Ben-Attia"
)
diff --git a/setup.py b/setup.py
index 86405b1..6d0fac7 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
from setuptools import setup
import setuptools
-q_version = '3.1.5'
+q_version = '3.1.6'
with open("README.markdown", "r", encoding="utf-8") as fh:
long_description = fh.read()