From 3f7c91ca80d80e796059a569e2321459c1cc42bd Mon Sep 17 00:00:00 2001 From: Jacob Clark Date: Fri, 4 Nov 2022 12:15:00 -0700 Subject: [PATCH 1/5] =?UTF-8?q?feat:=20=E2=9C=A8=20Added=20linux=20+=20mac?= =?UTF-8?q?=20auto-deploy=20GitHub=20Action=20wofkflow?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build-and-deploy-linux.yml | 42 +++++++++++++++++ .github/workflows/Build-and-deploy-mac.yml | 49 ++++++++++++++++++++ 2 files changed, 91 insertions(+) create mode 100644 .github/workflows/Build-and-deploy-linux.yml create mode 100644 .github/workflows/Build-and-deploy-mac.yml diff --git a/.github/workflows/Build-and-deploy-linux.yml b/.github/workflows/Build-and-deploy-linux.yml new file mode 100644 index 000000000..5cb93c0d3 --- /dev/null +++ b/.github/workflows/Build-and-deploy-linux.yml @@ -0,0 +1,42 @@ +name: Build-and-deploy-linux +run-name: ${{ github.actor }} is building a linux release for SODA + +on: + push: + branches: + - main + +jobs: + deploy-on-linux: + runs-on: ubuntu-latest + + defaults: + run: + shell: bash -l {0} + + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-python@v2 + with: + python-version: 3.9 + + - uses: conda-incubator/setup-miniconda@v2 + with: + activate-environment: env-electron-python + environment-file: tools/anaconda-env/environment-Linux.yml + auto-activate-base: false + + - uses: actions/setup-node@v3 + with: + node-version: "14" + + - name: Install package.json modules and their dependencies + run: npm install --ignore-scripts + + - name: Build and deploy on Linux + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + run: | + npm run python-onefile-build + npm run deploy-linux diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml new file mode 100644 index 000000000..1cc72b7d4 --- /dev/null +++ b/.github/workflows/Build-and-deploy-mac.yml @@ -0,0 +1,49 @@ +name: Build-and-deploy-mac +run-name: ${{ github.actor }} is building a MAC release for SODA + +on: + push: + branches: + - main + +jobs: + deploy-on-mac: + runs-on: macos-latest + + defaults: + run: + shell: bash -l {0} + + steps: + - uses: actions/checkout@v3 + + - uses: actions/setup-python@v2 + with: + python-version: 3.9 + + - uses: conda-incubator/setup-miniconda@v2 + with: + activate-environment: env-electron-python + environment-file: tools/anaconda-env/environment-MAC.yml + auto-activate-base: false + + - uses: actions/setup-node@v3 + with: + node-version: "14" + + - name: Install package.json modules and their dependencies + run: npm install --ignore-scripts + + - uses: apple-actions/import-codesign-certs@v1 + with: + p12-file-base64: ${{ secrets.MACOS_CERTIFICATE }} + p12-password: ${{ secrets.MACOS_CERTIFICATE_PWD }} + + - name: Build and deploy on MAC + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + appleId: ${{ secrets.APPLE_ID }} + appleIdPassword: ${{ secrets.APPLE_PASSWORD }} + run: | + npm run python-onefile-build + npm run deploy-mac From e013eb3a8df27b7a9170d6c7e9bc2a0536ae28e9 Mon Sep 17 00:00:00 2001 From: Jacob Clark Date: Fri, 4 Nov 2022 12:16:31 -0700 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=E2=9C=A8=20updated=20app=20version?= =?UTF-8?q?=20to=209.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/Build-and-deploy-linux.yml | 2 +- .github/workflows/Build-and-deploy-mac.yml | 2 +- pyflask/startup/minimumApiVersion.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Build-and-deploy-linux.yml b/.github/workflows/Build-and-deploy-linux.yml index 5cb93c0d3..7fb040955 100644 --- a/.github/workflows/Build-and-deploy-linux.yml +++ b/.github/workflows/Build-and-deploy-linux.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: "14" + node-version: "16" - name: Install package.json modules and their dependencies run: npm install --ignore-scripts diff --git a/.github/workflows/Build-and-deploy-mac.yml b/.github/workflows/Build-and-deploy-mac.yml index 1cc72b7d4..a3f3caca9 100644 --- a/.github/workflows/Build-and-deploy-mac.yml +++ b/.github/workflows/Build-and-deploy-mac.yml @@ -29,7 +29,7 @@ jobs: - uses: actions/setup-node@v3 with: - node-version: "14" + node-version: "16" - name: Install package.json modules and their dependencies run: npm install --ignore-scripts diff --git a/pyflask/startup/minimumApiVersion.py b/pyflask/startup/minimumApiVersion.py index a3e5fb6ae..abf461832 100644 --- a/pyflask/startup/minimumApiVersion.py +++ b/pyflask/startup/minimumApiVersion.py @@ -5,6 +5,6 @@ def get_api_version(): Returns the version of the API """ - return {'version': os.getenv('API_VERSION', "9.4.0")} + return {'version': os.getenv('API_VERSION', "9.4.1")} From d5c3cc367d7728f0773a7788aa4c22822f5b4b2a Mon Sep 17 00:00:00 2001 From: Jacob Clark Date: Fri, 4 Nov 2022 12:18:06 -0700 Subject: [PATCH 3/5] feat: update package.json version number --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0970a78c9..f5f867625 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "soda-for-sparc", "productName": "SODA for SPARC", - "version": "9.4.0", + "version": "9.4.1", "description": "Keep Calm and Curate ", "main": "main.js", "scripts": { From 63f688ea7fc6660e903e8b37617588e556b02963 Mon Sep 17 00:00:00 2001 From: Jacob Clark Date: Fri, 4 Nov 2022 12:20:24 -0700 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E2=9C=A8=20updated=20package-lock?= =?UTF-8?q?=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 - package-lock.json | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 2e253a01c..df132a464 100644 --- a/.gitignore +++ b/.gitignore @@ -17,7 +17,6 @@ build/ app.spec *.pyc -package-lock.json src/.DS_Store .DS_Store electron-builder.yml diff --git a/package-lock.json b/package-lock.json index 8db1b5778..143c6357d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "soda-for-sparc", - "version": "9.4.0", + "version": "9.4.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "soda-for-sparc", - "version": "9.4.0", + "version": "9.4.1", "hasInstallScript": true, "license": "MIT", "dependencies": { From 12d62f94b7f77fabc2e830559e9833aea42dafd3 Mon Sep 17 00:00:00 2001 From: Jacob Clark Date: Fri, 4 Nov 2022 12:28:34 -0700 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20=E2=9C=A8=20Updated=20CHANGELOG=20f?= =?UTF-8?q?or=20version=209.4.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5e9bd4b01..82a4b81c5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,12 @@ All notable changes to SODA will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). +## v.9.4.1 - 2022-11-04 + +## Bug fixes: + +- Manual Windows build creation to fix an issue with the back-end not connectiong on Windows. + ## v.9.4.0 - 2022-11-02 ## Feature additions: