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 Jan 9, 2022
2 parents 8991156 + b844444 commit a6f97b1
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
# Workflow dispatch event that pushes the current version to the release branch.
# From here the secondary production deployment workflow will trigger to build the dependencies.
- name: Deploy 🚀
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
branch: releases/v4
folder: .
Expand Down
22 changes: 11 additions & 11 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/checkout@v2.4.0

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
git-config-name: Montezuma
git-config-email: montezuma@jamesiv.es
Expand All @@ -44,7 +44,7 @@ jobs:
uses: actions/checkout@v1

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages
Expand All @@ -71,7 +71,7 @@ jobs:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
branch: gh-pages
folder: integration
Expand Down Expand Up @@ -103,7 +103,7 @@ jobs:
apt-get update && apt-get install -y rsync
- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
branch: gh-pages
folder: integration
Expand All @@ -127,7 +127,7 @@ jobs:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
branch: gh-pages
Expand Down Expand Up @@ -157,7 +157,7 @@ jobs:
ssh-private-key: ${{ secrets.DEPLOY_KEY }}

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
ssh-key: true
branch: gh-pages
Expand Down Expand Up @@ -186,7 +186,7 @@ jobs:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
branch: gh-pages
Expand All @@ -195,7 +195,7 @@ jobs:
silent: true

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
branch: gh-pages
Expand Down Expand Up @@ -228,7 +228,7 @@ jobs:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages
Expand All @@ -247,7 +247,7 @@ jobs:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: integration-test-delete-prod
Expand All @@ -256,7 +256,7 @@ jobs:
silent: true

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: integration-test-delete-prod
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/sponsors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,15 @@ jobs:
uses: actions/checkout@v2.4.0

- name: Generate Sponsors 💖
uses: JamesIves/github-sponsors-readme-action@1.0.6
uses: JamesIves/github-sponsors-readme-action@1.0.7
with:
token: ${{ secrets.PAT }}
file: 'README.md'
template: '<a href="https://github.com/{{{ login }}}"><img src="https://github.com/{{{ login }}}.png" width="50px" alt="" /></a>'
minimum: 500

- name: Deploy to GitHub Pages
uses: JamesIves/github-pages-deploy-action@4.1.9
uses: JamesIves/github-pages-deploy-action@4.2.0
with:
branch: dev
folder: '.'
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "@jamesives/github-pages-deploy-action",
"description": "GitHub action for building a project and deploying it to GitHub pages.",
"author": "James Ives <iam@jamesiv.es> (https://jamesiv.es)",
"version": "4.1.9",
"version": "4.2.0",
"license": "MIT",
"main": "lib/lib.js",
"types": "lib/lib.d.ts",
Expand Down
2 changes: 1 addition & 1 deletion src/util.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export const checkParameters = (action: ActionInterface): void => {
}

if (
SupportedOperatingSystems.includes(
!SupportedOperatingSystems.includes(
process.env.RUNNER_OS as OperatingSystems
)
) {
Expand Down

0 comments on commit a6f97b1

Please sign in to comment.