Skip to content

Commit

Permalink
Merge pull request #26 from EdgePi-Cloud/dev
Browse files Browse the repository at this point in the history
merge dev to main
  • Loading branch information
jimmy121192 authored Jan 22, 2024
2 parents 491d702 + fdfde22 commit a2ff96a
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 5 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/npm-publish.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
name: Publish Package to npm
on:
push:
branches:
- main
tags:
- release/*
jobs:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/versioning.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,6 @@ jobs:
version=$(cat package.json | jq -r '.version')
git add .
git commit -m "Bump version to $version"
git push --follow-tags
git push --force origin "$branch_name":dev
- name: Delete versioned branch
Expand Down
2 changes: 1 addition & 1 deletion branch-name.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
version-20240122193629-877fd2e5
version-20240122195749-8a9a7b16
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"edgepi-adc": "edgepi-adc.js"
}
},
"version": "1.0.8",
"version": "1.0.9",
"description": "node-red node for edgepi adc module utilizing remote procedure calls",
"main": "index.js",
"scripts": {
Expand Down

0 comments on commit a2ff96a

Please sign in to comment.