Skip to content

Commit df51ad4

Browse files
authored
Merge pull request #8 from cosdon/1.2.0
1.2.0
2 parents 32c2eb1 + e067c16 commit df51ad4

8 files changed

Lines changed: 25 additions & 16 deletions

File tree

.github/workflows/build.yml

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
name: Build .deb files for arm & intel
1616
runs-on: ubuntu-22.04
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- name: Get Git History
2020
run: git fetch --unshallow --filter=blob:none --tags --force
2121
- name: Set Version
@@ -27,25 +27,31 @@ jobs:
2727
else
2828
echo "version=$(git describe --tags --long --match 'v*')" >> $GITHUB_OUTPUT
2929
fi
30-
- uses: actions/setup-node@v3
30+
- uses: actions/setup-node@v4
3131
with:
3232
node-version: '20'
3333
- run: |
3434
sudo apt update && sudo apt install p7zip-full nsis
3535
CLI_VERSION=${{ steps.set-version.outputs.version }} node cli/.ci/set-package-vars.js
3636
CI_CD_BUILD=1 cli/.ci/package.sh
37-
- name: Archive artifacts
38-
uses: actions/upload-artifact@v3
37+
- name: Archive Linux artifacts
38+
uses: actions/upload-artifact@v4
3939
with:
4040
name: Linux
4141
path: |
42-
cli/tmp/artifacts
42+
cli/tmp/artifacts/linux
43+
- name: Archive Windows artifacts
44+
uses: actions/upload-artifact@v4
45+
with:
46+
name: Windows
47+
path: |
48+
cli/tmp/artifacts/windows
4349
4450
build-on-macos:
4551
name: Build, sign and notarize .pkg files for Mac
4652
runs-on: macos-14
4753
steps:
48-
- uses: actions/checkout@v3
54+
- uses: actions/checkout@v4
4955
- name: Get Git History
5056
run: git fetch --unshallow --filter=blob:none --tags --force
5157
- name: Set Version
@@ -57,7 +63,7 @@ jobs:
5763
else
5864
echo "version=$(git describe --tags --long --match 'v*')" >> $GITHUB_OUTPUT
5965
fi
60-
- uses: actions/setup-node@v3
66+
- uses: actions/setup-node@v4
6167
with:
6268
node-version: '20'
6369
- name: Install the Apple certificate and provisioning profile
@@ -106,7 +112,7 @@ jobs:
106112
security delete-keychain $RUNNER_TEMP/app-signing.keychain-db
107113
108114
- name: Archive Artifacts
109-
uses: actions/upload-artifact@v3
115+
uses: actions/upload-artifact@v4
110116
with:
111117
name: MacOS
112118
path: |

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
**/node_modules
22
lib/graphql.schema.json
3+
.vscode

cli/.ci/package.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,13 @@ copy_lib sarif
5151
if [[ "$OS" == 'Darwin' ]]; then
5252
yarn package-macos
5353
else
54-
mkdir -p tmp/artifacts
54+
mkdir -p tmp/artifacts/linux
5555
yarn package-deb
56-
cp dist/deb/* tmp/artifacts/
56+
cp dist/deb/* tmp/artifacts/linux
57+
58+
mkdir -p tmp/artifacts/windows
5759
yarn package-win
58-
cp dist/win32/* tmp/artifacts/
60+
cp dist/win32/* tmp/artifacts/windows
5961
fi
6062

6163
if [ -n "${LINKED}" ]; then

cli/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nowsecure/platform-cli",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"description": "NowSecure command line tool to interact with NowSecure Platform",
55
"author": "NowSecure",
66
"bin": {

github-snapshot/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nowsecure/github-snapshot",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"main": "./lib/index.js",
55
"types": "./lib/index.d.ts",
66
"license": "MIT",

lib/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@nowsecure/platform-lib",
33
"description": "A library to interact with NowSecure Platform",
4-
"version": "1.1.0",
4+
"version": "1.2.0",
55
"main": "./lib/index.js",
66
"types": "./lib/index.d.ts",
77
"license": "MIT",

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nowsecure/platform-lib-monorepo",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"license": "MIT",
55
"author": "NowSecure",
66
"scripts": {

sarif/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@nowsecure/sarif",
3-
"version": "1.1.0",
3+
"version": "1.2.0",
44
"main": "./lib/index.js",
55
"types": "./lib/index.d.ts",
66
"license": "MIT",

0 commit comments

Comments
 (0)