Merge pull request #22 from Project-OMOTES/WouterSpaak/issue17

WouterSpaak/issue17

.github/workflows/node_release.yml

@@ -8,6 +8,9 @@ jobs:
   npm-publish:
     runs-on: ubuntu-latest
     environment: release
+    permissions:
+      contents: read
+      id-token: write
     defaults:
       run:
         working-directory: ./typescript
@@ -25,8 +28,8 @@ jobs:
       - name: Build and publish to NPM
         run: |
           npm ci
-          npm run set-version --version="${{ github.ref_name }}"
           npm run build
-          npm publish --public
+          npm version from-git --force
+          npm publish --provenance --access public
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

.gitignore

@@ -1,3 +1,5 @@
+.DS_Store
+
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]
@@ -222,4 +224,7 @@ fabric.properties
 unit_test_coverage/
 test-results.xml
 
-.env.*
+.env.*
+
+typescript/src/job_pb.d.ts
+typescript/src/job_pb.js

typescript/README.md

@@ -16,13 +16,3 @@ Run the following command to build the protobuf artifacts:
 ```sh
 npm run build
 ```
-
-### Bumping version from tag
-
-To correctly version `package.json` with the corresponding git tag, run:
-
-```sh
-npm run set-version major.minor.patch
-```
-
-You shouldn't have to run this yourself, it will be called through GitHub actions (see [node_release.yml](../.github/workflows/node_release.yml)).

typescript/package.json

@@ -1,11 +1,9 @@
 {
   "name": "@omotes/proto",
-  "version": "0.0.0",
   "description": "Protobuf implementation for OMOTES jobs.",
   "main": "./src/job_pb.js",
   "typings": "./src/job_pb.d.ts",
   "scripts": {
-    "set-version": "./node_modules/.bin/ts-node ./version.ts",
     "build": "./node_modules/.bin/ts-node ./proto.ts"
   },
   "repository": {
@@ -31,5 +29,6 @@
   },
   "dependencies": {
     "google-protobuf": "^3.21.2"
-  }
+  },
+  "version": "0.1.6"
 }