Skip to content

Commit

Permalink
Merge pull request #8 from cosdon/1.2.0
Browse files Browse the repository at this point in the history
1.2.0
  • Loading branch information
cosdon authored Aug 29, 2024
2 parents 32c2eb1 + e067c16 commit df51ad4
Show file tree
Hide file tree
Showing 8 changed files with 25 additions and 16 deletions.
22 changes: 14 additions & 8 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
name: Build .deb files for arm & intel
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Git History
run: git fetch --unshallow --filter=blob:none --tags --force
- name: Set Version
Expand All @@ -27,25 +27,31 @@ jobs:
else
echo "version=$(git describe --tags --long --match 'v*')" >> $GITHUB_OUTPUT
fi
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '20'
- run: |
sudo apt update && sudo apt install p7zip-full nsis
CLI_VERSION=${{ steps.set-version.outputs.version }} node cli/.ci/set-package-vars.js
CI_CD_BUILD=1 cli/.ci/package.sh
- name: Archive artifacts
uses: actions/upload-artifact@v3
- name: Archive Linux artifacts
uses: actions/upload-artifact@v4
with:
name: Linux
path: |
cli/tmp/artifacts
cli/tmp/artifacts/linux
- name: Archive Windows artifacts
uses: actions/upload-artifact@v4
with:
name: Windows
path: |
cli/tmp/artifacts/windows
build-on-macos:
name: Build, sign and notarize .pkg files for Mac
runs-on: macos-14
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Get Git History
run: git fetch --unshallow --filter=blob:none --tags --force
- name: Set Version
Expand All @@ -57,7 +63,7 @@ jobs:
else
echo "version=$(git describe --tags --long --match 'v*')" >> $GITHUB_OUTPUT
fi
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: '20'
- name: Install the Apple certificate and provisioning profile
Expand Down Expand Up @@ -106,7 +112,7 @@ jobs:
security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
- name: Archive Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: MacOS
path: |
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
**/node_modules
lib/graphql.schema.json
.vscode
8 changes: 5 additions & 3 deletions cli/.ci/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,13 @@ copy_lib sarif
if [[ "$OS" == 'Darwin' ]]; then
yarn package-macos
else
mkdir -p tmp/artifacts
mkdir -p tmp/artifacts/linux
yarn package-deb
cp dist/deb/* tmp/artifacts/
cp dist/deb/* tmp/artifacts/linux

mkdir -p tmp/artifacts/windows
yarn package-win
cp dist/win32/* tmp/artifacts/
cp dist/win32/* tmp/artifacts/windows
fi

if [ -n "${LINKED}" ]; then
Expand Down
2 changes: 1 addition & 1 deletion cli/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nowsecure/platform-cli",
"version": "1.1.0",
"version": "1.2.0",
"description": "NowSecure command line tool to interact with NowSecure Platform",
"author": "NowSecure",
"bin": {
Expand Down
2 changes: 1 addition & 1 deletion github-snapshot/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nowsecure/github-snapshot",
"version": "1.1.0",
"version": "1.2.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion lib/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@nowsecure/platform-lib",
"description": "A library to interact with NowSecure Platform",
"version": "1.1.0",
"version": "1.2.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"license": "MIT",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nowsecure/platform-lib-monorepo",
"version": "1.1.0",
"version": "1.2.0",
"license": "MIT",
"author": "NowSecure",
"scripts": {
Expand Down
2 changes: 1 addition & 1 deletion sarif/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nowsecure/sarif",
"version": "1.1.0",
"version": "1.2.0",
"main": "./lib/index.js",
"types": "./lib/index.d.ts",
"license": "MIT",
Expand Down

0 comments on commit df51ad4

Please sign in to comment.