Skip to content

Commit

Permalink
Fixed merge
Browse files Browse the repository at this point in the history
  • Loading branch information
markcallen committed Mar 11, 2023
2 parents 7795a3d + b18fe02 commit ef538ef
Show file tree
Hide file tree
Showing 8 changed files with 1,234 additions and 1,316 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build-main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 16.13.0
node-version: 18.14.0

- name: Install Node.js dependencies
run: yarn
Expand Down
14 changes: 14 additions & 0 deletions .github/workflows/njsscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,3 +40,17 @@ jobs:
uses: github/codeql-action/upload-sarif@v2
with:
sarif_file: results.sarif
- name: Notify failures
if: failure()
uses: rtCamp/action-slack-notify@v2
env:
SLACK_LINK_NAMES: true
SLACK_MESSAGE:
# prettier-ignore
"hey @${{ github.actor }}, @mark, sorry to let you know you broke the build"
SLACK_CHANNEL: feed-github
SLACK_COLOR: ${{ job.status }}
SLACK_ICON: https://avatars.githubusercontent.com/u/82425418?s=200&v=4
SLACK_TITLE: 'Failed: cld-cli to dev :fire:'
SLACK_USERNAME: cld-cli-bot
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
16 changes: 15 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
- name: Set up Node.js
uses: actions/setup-node@v3
with:
node-version: 16.13.0
node-version: 18.14.0
registry-url: 'https://registry.npmjs.org'

- name: Install Node.js dependencies
Expand All @@ -34,3 +34,17 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
- name: Notify failures
if: failure()
uses: rtCamp/action-slack-notify@v2
env:
SLACK_LINK_NAMES: true
SLACK_MESSAGE:
# prettier-ignore
"hey @${{ github.actor }}, @mark, sorry to let you know you broke the build"
SLACK_CHANNEL: feed-github
SLACK_COLOR: ${{ job.status }}
SLACK_ICON: https://avatars.githubusercontent.com/u/82425418?s=200&v=4
SLACK_TITLE: 'Failed: cld-cli to dev :fire:'
SLACK_USERNAME: cld-cli-bot
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
14 changes: 14 additions & 0 deletions .github/workflows/snyk.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,17 @@ jobs:
uses: snyk/actions/node@master
env:
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
- name: Notify failures
if: failure()
uses: rtCamp/action-slack-notify@v2
env:
SLACK_LINK_NAMES: true
SLACK_MESSAGE:
# prettier-ignore
"hey @${{ github.actor }}, @mark, sorry to let you know you broke the build"
SLACK_CHANNEL: feed-github
SLACK_COLOR: ${{ job.status }}
SLACK_ICON: https://avatars.githubusercontent.com/u/82425418?s=200&v=4
SLACK_TITLE: 'Failed: cld-cli to dev :fire:'
SLACK_USERNAME: cld-cli-bot
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
14 changes: 14 additions & 0 deletions .github/workflows/unittest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,3 +41,17 @@ jobs:
run: npm run test
env:
AWS_SDK_LOAD_CONFIG: 1
- name: Notify failures
if: failure()
uses: rtCamp/action-slack-notify@v2
env:
SLACK_LINK_NAMES: true
SLACK_MESSAGE:
# prettier-ignore
"hey @${{ github.actor }}, @mark, sorry to let you know you broke the build"
SLACK_CHANNEL: feed-github
SLACK_COLOR: ${{ job.status }}
SLACK_ICON: https://avatars.githubusercontent.com/u/82425418?s=200&v=4
SLACK_TITLE: 'Failed: cld-cli to dev :fire:'
SLACK_USERNAME: cld-cli-bot
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ cld CLI - managing cloud resources from the command-line
[![oclif](https://img.shields.io/badge/cli-oclif-brightgreen.svg)](https://oclif.io)
[![Version](https://img.shields.io/npm/v/cld-cli.svg)](https://npmjs.org/package/cld-cli)
[![build](https://img.shields.io/github/actions/workflow/status/markcallen/cld-cli/build-main.yml)](https://github.com/markcallen/cld-cli/tree/main)
[![test](https://img.shields.io/github/actions/workflow/status/markcallen/cld-cli/unittest.yaml)](https://github.com/markcallen/cld-cli/tree/main)
![vulnerabilities](https://img.shields.io/snyk/vulnerabilities/github/markcallen/cld-cli)
[![Downloads/week](https://img.shields.io/npm/dw/cld-cli.svg)](https://npmjs.org/package/cld-cli)
[![License](https://img.shields.io/npm/l/cld-cli.svg)](https://github.com/markcallen/cld-cli/blob/main/LICENSE)
Expand Down Expand Up @@ -308,7 +309,7 @@ DESCRIPTION

Using release-it for releases.

To do a release run the Github Release workflow on main.
To do a release run the Github Release workflow on main. Use this action: https://github.com/markcallen/cld-cli/actions/workflows/release.yml and run against the main branch.

To to a minor (or major) vesion change run

Expand Down
10 changes: 4 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,23 @@
"@oclif/core": "^1.26.1",
"@oclif/plugin-help": "^5",
"@oclif/plugin-plugins": "^2.3.2",
"aws-sdk": "^2.1310.0",
"aws-sdk": "^2.1311.0",
"template-file": "^6.0.1"
},
"devDependencies": {
"@oclif/test": "^2",
"@types/chai": "^4",
"@types/mocha": "^9.0.0",
"@types/node": "^18.13.0",
"@types/mocha": "^10.0.1",
"@types/node": "^18.14.1",
"chai": "^4",
"eslint": "^7.32.0",
"eslint-config-oclif": "^4",
"eslint-config-oclif-typescript": "^1.0.3",
"eslint-config-prettier": "^8.6.0",
"eslint-plugin-prettier": "^4.2.1",
"globby": "^11",
"husky": "^8.0.3",
"lint-staged": "^13.1.2",
"mocha": "^9",
"mocha": "^10",
"oclif": "^3",
"prettier": "^2.8.4",
"release-it": "^15.6.0",
Expand Down Expand Up @@ -69,7 +68,6 @@
"prepack": "yarn build && oclif manifest && oclif readme",
"postpack": "shx rm -f oclif.manifest.json",
"test": "mocha --forbid-only \"test/**/*.test.ts\"",
"posttest": "yarn lint",
"version": "oclif readme && git add README.md",
"lint": "eslint . --ext .ts,.js --config .eslintrc",
"lint:fix": "eslint . --ext .ts,js --config .eslintrc --fix",
Expand Down
Loading

0 comments on commit ef538ef

Please sign in to comment.