adk23333/github-pages-deploy-action
1
0
Fork 0
mirror of https://github.com/JamesIves/github-pages-deploy-action.git synced 2023-12-15 20:03:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
1,157 Commits 23 Branches 95 Tags 69 MiB
95f8a2cd05
Commit Graph

145 Commits

Author SHA1 Message Date
Ross Williams
95f8a2cd05
Resolve simultaneous deployments with rebase (#1054) 
* Return early from dry run

Determining whether to create a merge commit would elicit a nested
conditional, which could be hard to parse for a human reader. This is
avoided by returning early as soon as possible for a dry run.

This also resolves the erroneous 'changes committed' message when no
changes were actually committed because of the dry run. A message
specific to dry-run is logged instead.

* Add force parameter to action interface

Existing behaviour is equivalent to force=true, so the default value is
true.

* Implement pull+rebase procedure

* Declare force parameter in action

* Detect both rejection syntaxes

* Return both stdout and stderr from execute

* Ignore non-zero exit status on push

* Remove unnecessary error catch

* Fetch and rebase in separate steps

* Explicitly bind incoming branch

I think the fetch will update the origin/gh-pages branch but not the
gh-pages branch, despite requesting gh-pages. This means that when I
later attempt to rebase the temp branch on top of the gh-pages branch,
there will be nothing to do, because that's already where it is.

* Implement attempt limit

I don't expect this to ever require more than one attempt in production,
but in theory it's possible that this procedure could loop forever.

We would need to keep fetching and rebasing if changes keep being added
to the remote. In practice, I believe this would only happen if there
are lots of workflows simultaneously deploying to the same branch, all
using this action. In this case only one would be able to secure a lock
at a time, leading to the total number of attempts being equal to the
number of simultaneous deployments, assuming each deployment makes each
attempt at the exact same time.

The limit may need to be increased or even be configurable, but 3 should
cover most uses.

* Update tests for execute output split

* Document 'force' parameter

* Create integration test for rebase procedure

This test is composed of 3 jobs.

The first two jobs run simultaneously, and as such both depend on the
previous integration test only. The final job cleans up afterwards, and
depends on both of the prior jobs.

The two jobs are identical except that they both create a temporary file
in a different location. This is to ensure that they conflict. Correctly
resolving this conflict by rebasing one deployment over the other,
resulting in a deployment containing both files, indicates a successful
test.
 2022-04-04 07:18:27 -04:00
dependabot[bot]
8cb2e21c07
Bump actions/checkout from 2.4.0 to 3 (#1050) 
Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-03-02 06:48:26 -05:00
dependabot[bot]
c4fb408c85
Bump actions/setup-node from 2.5.1 to 3 (#1048) 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2.5.1 to 3.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2.5.1...v3)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-02-26 17:17:42 -05:00
dependabot[bot]
ca88c7228a
Bump JamesIves/github-pages-deploy-action from 4.2.3 to 4.2.5 (#1041) 2022-02-17 06:19:08 -05:00
dependabot[bot]
1de53dd290
Bump JamesIves/github-pages-deploy-action from 4.2.2 to 4.2.3 (#1025) 2022-02-01 06:06:40 -05:00
James Ives
91d4e8f962
Part 1: Logging Improvements (#1022) 
* Part 1 of Logging Improvements

* Update util.test.ts

* Update util.test.ts

* Update util.test.ts

* Update util.test.ts

* Adjustments to tests

* Update util.test.ts

* Update util.ts
 2022-01-31 08:08:23 -05:00
dependabot[bot]
cdd72ba2c4
Bump nowactions/update-majorver from 1.1.0 to 1.1.2 (#1021) 
Bumps [nowactions/update-majorver](https://github.com/nowactions/update-majorver) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/nowactions/update-majorver/releases)
- [Commits](https://github.com/nowactions/update-majorver/compare/v1.1.0...v1.1.2)

---
updated-dependencies:
- dependency-name: nowactions/update-majorver
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-31 06:17:58 -05:00
James Ives
92429b8919
Update production.yml 2022-01-29 10:19:16 -05:00
James Ives
0332481b48
Update build.yml 2022-01-29 10:18:53 -05:00
James Ives
f47bc81799
Update sponsors.yml 2022-01-12 10:14:29 -05:00
James Ives
c9442feeaf
Adds premium sponsorship tier 2022-01-12 08:29:34 -05:00
James Ives
d514a16587
Update sponsors.yml 2022-01-12 07:59:06 -05:00
James Ives
fee58dc841 Use major version for integration tests 2022-01-11 23:22:19 -05:00
James Ives
d5d62ac72e
Update version.yml 2022-01-11 23:19:28 -05:00
dependabot[bot]
7210ba87fd
Bump JamesIves/github-pages-deploy-action from 4.2.1 to 4.2.2 (#1002) 
Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.2.1 to 4.2.2.
- [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
- [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/4.2.1...v4.2.2)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-11 08:13:14 -05:00
dependabot[bot]
97e5b2337a
Bump JamesIves/github-sponsors-readme-action from 1.0.7 to 1.0.8 (#1001) 
Bumps [JamesIves/github-sponsors-readme-action](https://github.com/JamesIves/github-sponsors-readme-action) from 1.0.7 to 1.0.8.
- [Release notes](https://github.com/JamesIves/github-sponsors-readme-action/releases)
- [Commits](https://github.com/JamesIves/github-sponsors-readme-action/compare/1.0.7...v1.0.8)

---
updated-dependencies:
- dependency-name: JamesIves/github-sponsors-readme-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-11 08:13:06 -05:00
James Ives
3b9d7a3a2b Merge branch 'dev' of https://github.com/JamesIves/github-pages-deploy-action into dev 2022-01-10 08:33:01 -05:00
James Ives
f9ac38d93f Adds versioning change 2022-01-10 08:32:58 -05:00
dependabot[bot]
7456853943
Bump JamesIves/github-pages-deploy-action from 4.2.0 to 4.2.1 (#998) 
Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.2.0 to 4.2.1.
- [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
- [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/4.2.0...4.2.1)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-10 08:02:21 -05:00
dependabot[bot]
53efaaaccb
Bump JamesIves/github-pages-deploy-action from 4.1.9 to 4.2.0 (#992) 2022-01-07 10:30:46 +00:00
James Ives
5608b8174d
Update sponsors.yml 2022-01-06 10:41:48 -05:00
dependabot[bot]
c9ee890462
Bump JamesIves/github-sponsors-readme-action from 1.0.5 to 1.0.6 (#988) 
Bumps [JamesIves/github-sponsors-readme-action](https://github.com/JamesIves/github-sponsors-readme-action) from 1.0.5 to 1.0.6.
- [Release notes](https://github.com/JamesIves/github-sponsors-readme-action/releases)
- [Commits](https://github.com/JamesIves/github-sponsors-readme-action/compare/1.0.5...1.0.6)

---
updated-dependencies:
- dependency-name: JamesIves/github-sponsors-readme-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-06 09:53:13 -05:00
James Ives
a7cf017c75
Ignore Case (#987) 
* Update git.ts

* Formatting

* formatting

* Tests
 2022-01-06 09:50:18 -05:00
dependabot[bot]
43e20fe3ca
Bump dawidd6/action-delete-branch from 2.0.1 to 3.1.0 (#982) 
Bumps [dawidd6/action-delete-branch](https://github.com/dawidd6/action-delete-branch) from 2.0.1 to 3.1.0.
- [Release notes](https://github.com/dawidd6/action-delete-branch/releases)
- [Commits](https://github.com/dawidd6/action-delete-branch/compare/v2.0.1...v3.1.0)

---
updated-dependencies:
- dependency-name: dawidd6/action-delete-branch
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-06 08:47:01 -05:00
dependabot[bot]
e92afa83cc
Bump actions/setup-node from 1.4.4 to 2.5.1 (#983) 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 1.4.4 to 2.5.1.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v1.4.4...v2.5.1)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-06 08:46:55 -05:00
dependabot[bot]
d97d054194
Bump webfactory/ssh-agent from 0.4.1 to 0.5.4 (#984) 
Bumps [webfactory/ssh-agent](https://github.com/webfactory/ssh-agent) from 0.4.1 to 0.5.4.
- [Release notes](https://github.com/webfactory/ssh-agent/releases)
- [Changelog](https://github.com/webfactory/ssh-agent/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webfactory/ssh-agent/compare/v0.4.1...v0.5.4)

---
updated-dependencies:
- dependency-name: webfactory/ssh-agent
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-06 08:46:48 -05:00
dependabot[bot]
5ef208127e
Bump codecov/codecov-action from 1 to 2.1.0 (#985) 
Bumps [codecov/codecov-action](https://github.com/codecov/codecov-action) from 1 to 2.1.0.
- [Release notes](https://github.com/codecov/codecov-action/releases)
- [Changelog](https://github.com/codecov/codecov-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-action/compare/v1...v2.1.0)

---
updated-dependencies:
- dependency-name: codecov/codecov-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-06 08:46:40 -05:00
dependabot[bot]
6476a4409f
Bump JamesIves/github-pages-deploy-action from 4.0.0 to 4.1.9 (#986) 
Bumps [JamesIves/github-pages-deploy-action](https://github.com/JamesIves/github-pages-deploy-action) from 4.0.0 to 4.1.9.
- [Release notes](https://github.com/JamesIves/github-pages-deploy-action/releases)
- [Commits](https://github.com/JamesIves/github-pages-deploy-action/compare/4.0.0...4.1.9)

---
updated-dependencies:
- dependency-name: JamesIves/github-pages-deploy-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-01-06 08:46:32 -05:00
James Ives
a5d8ac6765 Modifies versioning 2022-01-06 08:39:45 -05:00
James Ives
760b8aba1c
Update publish.yml 2021-11-18 08:42:57 -05:00
James Ives
2d9f6f66a1 🔧 Node Version 2021-11-18 08:12:09 -05:00
James Ives
437803aab1 Assigning readme changes for 4.1.4 2021-06-04 10:10:55 -04:00
James Ives
097d2b354c Docs 2021-05-11 19:23:56 -04:00
James Ives
c8f3300436 4.1.2 2021-05-10 10:36:46 -04:00
James Ives
6502bd3a55
Changes to ref search (#705) 
* Exact match on branchExists

* Linting
 2021-05-10 09:18:05 -04:00
James Ives
0afb880e95
Allow Subsequent Deployments (#690) 
* Removing artifacts

* Update git.ts

* Update git.ts

* Fixng up unit tests

* Update main.test.ts

* Update integration.yml

* Update integration.yml
 2021-05-10 09:17:42 -04:00
James Ives
3fe8ff95b7 Update sponsors.yml 2021-05-06 09:06:50 -04:00
James Ives
f0e52745d5 Update sponsors.yml 2021-05-05 23:39:54 -04:00
James Ives
3ee97cff89 Adds Sponsors 2021-05-05 23:20:11 -04:00
James Ives
4bb15711fb
Eslint improvements (#686) 
* Initial Pass at new configs

* Improved Linting/Formatting

* Update execute.ts

* Update main.test.ts

* Change typing

* Update git.ts

* Update worktree.ts

* Update worktree.ts

* Update worktree.ts

* Maybe

* Update execute.ts
 2021-04-26 18:57:10 -04:00
James Ives
275cab7b2f Restore 2021-02-28 09:10:36 -05:00
James Ives
8071991fe8 Double Quotes not allowed? 2021-02-28 09:09:15 -05:00
James Ives
207c32e0dc Integration Test 2021-02-28 09:08:07 -05:00
James Ives
cece268304 Update integration.yml 2021-02-14 11:03:56 -05:00
James Ives
b94aa2504f Update integration.yml 2021-02-14 11:02:41 -05:00
James Ives
6f49a521be
Improvements to workflow automation (#597) 2021-02-10 09:12:47 -05:00
James Ives
476151d9aa Integration Test Upgrades 2021-02-08 10:06:11 -05:00
James Ives
4bd5861a58 Restore to releases/v4 2021-02-08 09:44:51 -05:00
James Ives
937fa944b8 Additional workflow adjustments for deployments 2021-02-08 09:40:49 -05:00
James Ives
babb004003 Update deploy.yml 2021-02-08 09:23:04 -05:00