Skip to content

Commit a6617e4

Browse files
committed
replace to continue-on-error, so release will be created... + bump to 3.1.6
1 parent 19bfff3 commit a6617e4

File tree

7 files changed

+35
-35
lines changed

7 files changed

+35
-35
lines changed

.github/workflows/build-and-package.yaml

+24-24
Original file line numberDiff line numberDiff line change
@@ -136,12 +136,12 @@ jobs:
136136
137137
gem install fpm
138138
cp dist/fpm-config ~/.fpm
139-
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
139+
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
140140
- name: Upload DEB Package
141141
uses: actions/[email protected]
142142
with:
143-
name: q-text-as-data-3.1.5-1.x86_64.deb
144-
path: packages/linux/q-text-as-data-3.1.5-1.x86_64.deb
143+
name: q-text-as-data-3.1.6-1.x86_64.deb
144+
path: packages/linux/q-text-as-data-3.1.6-1.x86_64.deb
145145

146146
test-deb-packaging:
147147
runs-on: ubuntu-18.04
@@ -152,7 +152,7 @@ jobs:
152152
- name: Download DEB
153153
uses: actions/download-artifact@v2
154154
with:
155-
name: q-text-as-data-3.1.5-1.x86_64.deb
155+
name: q-text-as-data-3.1.6-1.x86_64.deb
156156
- name: Install Python for Testing
157157
uses: actions/setup-python@v2
158158
with:
@@ -164,7 +164,7 @@ jobs:
164164
165165
pip3 install -r test-requirements.txt
166166
- name: Test DEB Package Installation
167-
run: ./dist/test-using-deb.sh ./q-text-as-data-3.1.5-1.x86_64.deb
167+
run: ./dist/test-using-deb.sh ./q-text-as-data-3.1.6-1.x86_64.deb
168168

169169
package-linux-rpm:
170170
needs: [test-linux, create-man]
@@ -196,12 +196,12 @@ jobs:
196196
197197
gem install fpm
198198
cp dist/fpm-config ~/.fpm
199-
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
199+
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
200200
- name: Upload RPM Package
201201
uses: actions/[email protected]
202202
with:
203-
name: q-text-as-data-3.1.5.x86_64.rpm
204-
path: packages/linux/q-text-as-data-3.1.5.x86_64.rpm
203+
name: q-text-as-data-3.1.6.x86_64.rpm
204+
path: packages/linux/q-text-as-data-3.1.6.x86_64.rpm
205205

206206
test-rpm-packaging:
207207
runs-on: ubuntu-18.04
@@ -212,9 +212,9 @@ jobs:
212212
- name: Download RPM
213213
uses: actions/download-artifact@v2
214214
with:
215-
name: q-text-as-data-3.1.5.x86_64.rpm
215+
name: q-text-as-data-3.1.6.x86_64.rpm
216216
- name: Retest using RPM
217-
run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.5.x86_64.rpm
217+
run: ./dist/test-using-rpm.sh ./q-text-as-data-3.1.6.x86_64.rpm
218218

219219
build-mac:
220220
runs-on: macos-11
@@ -290,7 +290,7 @@ jobs:
290290
package-mac:
291291
# create-man is not needed, as it's generated inside the brew formula independently
292292
needs: [test-mac]
293-
if: ${{false}}
293+
continue-on-error: true
294294
runs-on: macos-11
295295
steps:
296296
- name: Checkout
@@ -306,7 +306,7 @@ jobs:
306306
export BRANCH_NAME=master
307307
308308
# TODO temp, since template rendering action doesn't work in mac
309-
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
309+
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
310310
311311
echo "Resulting formula:"
312312
cat ./brew/q.rb
@@ -320,8 +320,8 @@ jobs:
320320
- name: Upload Executable
321321
uses: actions/[email protected]
322322
with:
323-
name: q--3.1.5_1.big_sur.bottle.tar.gz
324-
path: ./q--3.1.5_1.big_sur.bottle.tar.gz
323+
name: q--3.1.6_1.big_sur.bottle.tar.gz
324+
path: ./q--3.1.6_1.big_sur.bottle.tar.gz
325325

326326
# TODO auto-create PR to main homebrew-core
327327
# git clone https://github.com/harelba/homebrew-core.git
@@ -331,15 +331,15 @@ jobs:
331331

332332
test-mac-packaging:
333333
needs: package-mac
334-
if: ${{false}}
334+
continue-on-error: true
335335
runs-on: macos-11
336336
steps:
337337
- name: Checkout
338338
uses: actions/checkout@v2
339339
- name: Download q bottle
340340
uses: actions/download-artifact@v2
341341
with:
342-
name: q--3.1.5_1.big_sur.bottle.tar.gz
342+
name: q--3.1.6_1.big_sur.bottle.tar.gz
343343
- name: Test the created bottle
344344
run: |
345345
set -x -e
@@ -348,7 +348,7 @@ jobs:
348348
WD=$(pwd)
349349
350350
pushd /usr/local/Cellar
351-
tar xvfz ${WD}/q--3.1.5_1.big_sur.bottle.tar.gz
351+
tar xvfz ${WD}/q--3.1.6_1.big_sur.bottle.tar.gz
352352
popd
353353
354354
brew link q
@@ -458,17 +458,17 @@ jobs:
458458
459459
# TODO Windows versions do not support the -beta postfix
460460
461-
export Q_MSI=./build/x86_64-pc-windows-msvc/release/msi_installer/q-text-as-data-3.1.5.msi
461+
export Q_MSI=./build/x86_64-pc-windows-msvc/release/msi_installer/q-text-as-data-3.1.6.msi
462462
chmod 755 $Q_MSI
463463
464464
mkdir -p packages/windows/
465-
cp $Q_MSI packages/windows/q-text-as-data-3.1.5.msi
465+
cp $Q_MSI packages/windows/q-text-as-data-3.1.6.msi
466466
467467
- name: Upload Windows MSI
468468
uses: actions/[email protected]
469469
with:
470-
name: q-text-as-data-3.1.5.msi
471-
path: packages/windows/q-text-as-data-3.1.5.msi
470+
name: q-text-as-data-3.1.6.msi
471+
path: packages/windows/q-text-as-data-3.1.6.msi
472472

473473
test-windows-packaging:
474474
needs: package-windows
@@ -479,12 +479,12 @@ jobs:
479479
- name: Download Windows Package
480480
uses: actions/download-artifact@v2
481481
with:
482-
name: q-text-as-data-3.1.5.msi
482+
name: q-text-as-data-3.1.6.msi
483483
- name: Test Install of MSI
484484
continue-on-error: true
485485
shell: powershell
486486
run: |
487-
$process = Start-Process msiexec.exe -ArgumentList "/i q-text-as-data-3.1.5.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait
487+
$process = Start-Process msiexec.exe -ArgumentList "/i q-text-as-data-3.1.6.msi -l* msi-install.log /norestart /quiet" -PassThru -Wait
488488
$process.ExitCode
489489
gc msi-install.log
490490
@@ -493,7 +493,7 @@ jobs:
493493
continue-on-error: true
494494
shell: powershell
495495
run: |
496-
$process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.5.msi /norestart /quiet" -PassThru -Wait
496+
$process = Start-Process msiexec.exe -ArgumentList "/u q-text-as-data-3.1.6.msi /norestart /quiet" -PassThru -Wait
497497
$process.ExitCode
498498
exit $process.ExitCode
499499

.github/workflows/q.rb.brew-formula-template

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
class Q < Formula
55
desc "Run SQL directly on CSV or TSV files"
66
homepage "https://harelba.github.io/q/"
7-
url "https://github.com/harelba/q/archive/v3.1.5.tar.gz"
7+
url "https://github.com/harelba/q/archive/v3.1.6.tar.gz"
88

99
sha256 "0f4656b19087332d5113dd38907b50d70c55a57b3e97f810b8090132412dc9fb"
1010

README.markdown

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ $ q "select count(*) from some_db.sqlite3:::albums a left join another_db.sqlite
3939
Detailed examples are in [here](http://harelba.github.io/q/#examples)
4040

4141
## Installation.
42-
**New Major Version `3.1.5` is out with a lot of significant additions.**
42+
**New Major Version `3.1.6` is out with a lot of significant additions.**
4343

4444
Instructions for all OSs are [here](http://harelba.github.io/q/#installation).
4545

bin/q.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
from sqlite3.dbapi2 import OperationalError
3636
from uuid import uuid4
3737

38-
q_version = '3.1.5'
38+
q_version = '3.1.6'
3939

4040
#__all__ = [ 'QTextAsData' ]
4141

mkdocs/docs/index.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ Download the tool using the links in the [installation](#installation) below and
6969
7070
| Format | Instructions | Comments |
7171
:---|:---|:---|
72-
|[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`||
73-
|[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`.|
74-
|[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|
75-
|[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.|
76-
|[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||
77-
|[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||
72+
|[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`||
73+
|[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`.|
74+
|[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|
75+
|[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.|
76+
|[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||
77+
|[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||
7878
7979
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.
8080

pyoxidizer.bzl

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def make_msi(exe):
6161
# The name of your application.
6262
"q-text-as-data",
6363
# The version of your application.
64-
"3.1.5",
64+
"3.1.6",
6565
# The author/manufacturer of your application.
6666
"Harel Ben-Attia"
6767
)

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
from setuptools import setup
44
import setuptools
55

6-
q_version = '3.1.5'
6+
q_version = '3.1.6'
77

88
with open("README.markdown", "r", encoding="utf-8") as fh:
99
long_description = fh.read()

0 commit comments

Comments
 (0)