Skip to content

Commit

Permalink
Merge branch 'dev' into releases/v4
Browse files Browse the repository at this point in the history
  • Loading branch information
JamesIves committed Apr 17, 2024
2 parents 65b5dfd + d60bb0b commit 1008d18
Show file tree
Hide file tree
Showing 23 changed files with 1,837 additions and 3,301 deletions.
2 changes: 0 additions & 2 deletions .devcontainer/Dockerfile

This file was deleted.

22 changes: 0 additions & 22 deletions .devcontainer/devcontainer.json

This file was deleted.

12 changes: 6 additions & 6 deletions .github/workflows/build.yml
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'v20.10.0'
node-version-file: '.nvmrc'
registry-url: 'https://registry.npmjs.org'

- name: Install Yarn
Expand All @@ -32,7 +32,7 @@ jobs:
yarn test
- name: Uploade CodeCov Report
uses: codecov/codecov-action@v3.1.4
uses: codecov/codecov-action@v4.3.0
with:
token: ${{ secrets.CODECOV_TOKEN }}

Expand All @@ -44,7 +44,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'v20.10.0'
node-version-file: '.nvmrc'
registry-url: 'https://registry.npmjs.org'

- name: Install Yarn
Expand All @@ -61,7 +61,7 @@ jobs:
ls node_modules
- name: artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: dist
path: |
Expand All @@ -84,11 +84,11 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'v20.10.0'
node-version-file: '.nvmrc'
registry-url: 'https://registry.npmjs.org'

- name: Download artifact
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: dist

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Expand Up @@ -22,10 +22,10 @@ jobs:
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3

- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
4 changes: 2 additions & 2 deletions .github/workflows/integration.yml
Expand Up @@ -151,7 +151,7 @@ jobs:
persist-credentials: false

- name: Install SSH Client
uses: webfactory/ssh-agent@v0.8.0
uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.DEPLOY_KEY }}

Expand All @@ -175,7 +175,7 @@ jobs:
steps:
- uses: actions/setup-node@v4
with:
node-version: 'v20.10.0'
node-version-file: '.nvmrc'

- name: Checkout
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/production.yml
Expand Up @@ -17,7 +17,7 @@ jobs:

- uses: actions/setup-node@v4
with:
node-version: 'v20.10.0'
node-version-file: '.nvmrc'
registry-url: 'https://registry.npmjs.org'

- name: Install Yarn
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Expand Up @@ -17,7 +17,7 @@ jobs:
# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v4
with:
node-version: 'v20.10.0'
node-version-file: '.nvmrc'
registry-url: 'https://registry.npmjs.org'
scope: '@jamesives'

Expand All @@ -43,7 +43,7 @@ jobs:
# Setup .npmrc file to publish to GitHub Packages
- uses: actions/setup-node@v4
with:
node-version: 'v20.10.0'
node-version-file: '.nvmrc'
registry-url: 'https://npm.pkg.github.com'
scope: '@jamesives'

Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/sponsors.yml
Expand Up @@ -18,6 +18,7 @@ jobs:
file: 'README.md'
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="50px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
maximum: 4999
active-only: false

- name: Generate Sponsors 💖
uses: JamesIves/github-sponsors-readme-action@v1
Expand All @@ -27,6 +28,7 @@ jobs:
minimum: 5000
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="80px" alt="{{{ login }}}" /></a>&nbsp;&nbsp;'
marker: 'premium'
active-only: false

- name: Deploy to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4
Expand Down
5 changes: 4 additions & 1 deletion .gitignore
Expand Up @@ -26,4 +26,7 @@ yarn-error.log
coverage

# Yarn Integrity file
.yarn-integrity
.yarn-integrity

# Dot Env
.env
12 changes: 6 additions & 6 deletions README.md
Expand Up @@ -67,7 +67,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
run: |
Expand All @@ -89,7 +89,7 @@ on:
- main
```

> **Warning**
> [!WARNING]
> If you do not supply the action with an access token or an SSH key, you must access your repositories settings and provide `Read and Write Permissions` to the provided `GITHUB_TOKEN`, otherwise you'll potentially run into permission issues. Alternatively you can set the following in your workflow file to grant the action the permissions it needs.
```yml
Expand Down Expand Up @@ -185,7 +185,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
run: |
Expand Down Expand Up @@ -235,7 +235,7 @@ jobs:
runs-on: windows-latest # The first job utilizes windows-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
run: |
Expand All @@ -254,7 +254,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Download Artifacts 🔻 # The built project is downloaded into the 'site' folder.
uses: actions/download-artifact@v1
Expand Down Expand Up @@ -308,7 +308,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: Install and Build 🔧 # This example project is built using npm and outputs the result to the 'build' folder. Replace with the commands required to build your project, or remove this step entirely if your site is pre-built.
run: |
Expand Down
4 changes: 2 additions & 2 deletions __tests__/execute.test.ts
Expand Up @@ -10,7 +10,7 @@ describe('execute', () => {
stdout('hello')
await execute('echo Montezuma', './', true)

expect(exec).toBeCalledWith('echo Montezuma', [], {
expect(exec).toHaveBeenCalledWith('echo Montezuma', [], {
cwd: './',
silent: true,
ignoreReturnCode: false,
Expand All @@ -27,7 +27,7 @@ describe('execute', () => {
stdout('hello')
await execute('echo Montezuma', './', false)

expect(exec).toBeCalledWith('echo Montezuma', [], {
expect(exec).toHaveBeenCalledWith('echo Montezuma', [], {
cwd: './',
silent: false,
ignoreReturnCode: false,
Expand Down

0 comments on commit 1008d18

Please sign in to comment.