Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: JamesIves/github-pages-deploy-action
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v4.2.5
Choose a base ref
...
head repository: JamesIves/github-pages-deploy-action
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v4.3.0
Choose a head ref
6 contributors
Loading
Showing 304 changed files with 151,296 additions and 36,975 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/build.yml
View file
Original file line number Diff line number Diff line change
@@ -14,9 +14,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3

- uses: actions/setup-node@v2.5.1
- uses: actions/setup-node@v3
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
@@ -39,9 +39,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3

- uses: actions/setup-node@v2.5.1
- uses: actions/setup-node@v3
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
@@ -77,11 +77,11 @@ jobs:
max-parallel: 1
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
persist-credentials: false

- uses: actions/setup-node@v2.5.1
- uses: actions/setup-node@v3
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ jobs:

steps:
- name: Checkout repository
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3

- name: Initialize CodeQL
uses: github/codeql-action/init@v1
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
View file
Original file line number Diff line number Diff line change
@@ -8,12 +8,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3

# 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@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
branch: releases/v4
folder: .
99 changes: 78 additions & 21 deletions .github/workflows/integration.yml
View file
Original file line number Diff line number Diff line change
@@ -20,10 +20,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
git-config-name: Montezuma
git-config-email: montezuma@jamesiv.es
@@ -41,10 +41,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v1
uses: actions/checkout@v3

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages
@@ -66,12 +66,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
branch: gh-pages
folder: integration
@@ -94,7 +94,7 @@ jobs:
LANG: C.UTF-8
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
persist-credentials: false

@@ -103,7 +103,7 @@ jobs:
apt-get update && apt-get install -y rsync
- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
branch: gh-pages
folder: integration
@@ -122,12 +122,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
branch: gh-pages
@@ -147,7 +147,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
persist-credentials: false

@@ -157,7 +157,7 @@ jobs:
ssh-private-key: ${{ secrets.DEPLOY_KEY }}

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
ssh-key: true
branch: gh-pages
@@ -176,17 +176,17 @@ jobs:
needs: integration-ssh-third-party-client
runs-on: ubuntu-latest
steps:
- uses: actions/setup-node@v2.5.1
- uses: actions/setup-node@v3
with:
node-version: 'v14.18.1'

- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
persist-credentials: false

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

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
ssh-key: ${{ secrets.DEPLOY_KEY }}
branch: gh-pages
@@ -223,12 +223,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
persist-credentials: false

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages
@@ -242,12 +242,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3
with:
persist-credentials: false

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

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
token: ${{ secrets.ACCESS_TOKEN }}
branch: integration-test-delete-prod
@@ -270,3 +270,60 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
branches: integration-test-delete-prod

# Creates two competing deployments, one of which should rebase over the other.
# First conflicting deployment
integration-rebase-conflicts-1:
needs: integration-branch-creation
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Create random file
run: echo $RANDOM > integration/1

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
git-config-name: Montezuma
git-config-email: montezuma@jamesiv.es
repository-name: MontezumaIves/lab
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages-rebase-conflict
folder: integration
force: false

# Second conflicting deployment
integration-rebase-conflicts-2:
needs: integration-branch-creation
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Create random file
run: echo $RANDOM > integration/2

- name: Build and Deploy
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
git-config-name: Montezuma
git-config-email: montezuma@jamesiv.es
repository-name: MontezumaIves/lab
token: ${{ secrets.ACCESS_TOKEN }}
branch: gh-pages-rebase-conflict
folder: integration
force: false
# Clean up conflicting deployments
integration-rebase-conflicts-cleanup:
needs: [integration-rebase-conflicts-1, integration-rebase-conflicts-2]
runs-on: ubuntu-latest
steps:
- name: Cleanup Generated Branch
uses: dawidd6/action-delete-branch@v3.1.0
with:
github_token: ${{ secrets.ACCESS_TOKEN }}
owner: MontezumaIves
repository: lab
branches: gh-pages
4 changes: 2 additions & 2 deletions .github/workflows/production.yml
View file
Original file line number Diff line number Diff line change
@@ -13,9 +13,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3

- uses: actions/setup-node@v2.5.1
- uses: actions/setup-node@v3
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
6 changes: 3 additions & 3 deletions .github/workflows/publish.yml
View file
Original file line number Diff line number Diff line change
@@ -10,12 +10,12 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2.4.0
- uses: actions/checkout@v3
with:
ref: dev

# Setup .npmrc file to publish to npm
- uses: actions/setup-node@v2.5.1
- uses: actions/setup-node@v3
with:
node-version: 'v14.18.1'
registry-url: 'https://registry.npmjs.org'
@@ -41,7 +41,7 @@ jobs:
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

# Setup .npmrc file to publish to GitHub Packages
- uses: actions/setup-node@v2.5.1
- uses: actions/setup-node@v3
with:
node-version: 'v14.18.1'
registry-url: 'https://npm.pkg.github.com'
4 changes: 2 additions & 2 deletions .github/workflows/sponsors.yml
View file
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout 🛎️
uses: actions/checkout@v2.4.0
uses: actions/checkout@v3

- name: Generate Sponsors 💖
uses: JamesIves/github-sponsors-readme-action@v1.0.8
@@ -29,7 +29,7 @@ jobs:
marker: 'premium'

- name: Deploy to GitHub Pages
uses: JamesIves/github-pages-deploy-action@v4.2.3
uses: JamesIves/github-pages-deploy-action@v4.2.5
with:
branch: dev
folder: '.'
Loading