Commit Graph

75 Commits

Author SHA1 Message Date
German
079ec0e130
Adding tag option to action (#1142)
* Adding tag option to action

* Avoiding adding tag if the remote name is not used.

* Adding unit tests

* Update readme.

* Update readme part 2

* Adding changes from the code review

* removing references to deleted parameters

* removing space
2022-07-17 09:33:00 -04:00
James Ives
1549ea03e5 Permission modifications 2022-04-23 16:34:30 -04:00
James Ives
1230c334d1
Safe directory fix (#1085)
* Potential fix for safe directory issue

* Update git.ts

* Update git.ts
2022-04-23 15:04:53 -04:00
James Ives
36e9415933 Improe coverage 2022-04-04 09:17:40 -04:00
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
Ross Williams
6faaf9d81d
Pretend to be running on Actions (#1055) 2022-03-12 10:44:00 -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
James Ives
a7cf017c75
Ignore Case (#987)
* Update git.ts

* Formatting

* formatting

* Tests
2022-01-06 09:50:18 -05:00
James Ives
7a45d6e75c
Allow single-commit to work cross repo (#979)
* Adjustments

* Formatting
2022-01-06 08:21:35 -05:00
James Ives
5acd2dbb1d Specification of empty git config <> 2021-11-26 07:46:44 -05:00
James Ives
755bf9f833
Folder Permissions (#925)
* Unit Tests

* Update main.test.ts
2021-11-18 07:49:23 -05:00
James Ives
bd6d73ed7d
Allow Empty Git Email Configs (#926)
* Allow empty email

* Update README.md

* Update constants.ts

* Allow email

* unsets email

* do not set

* Adjusted
2021-11-17 12:36:49 -05:00
Lucas dos Santos Abreu
460c7b8081
fix issue #866 - upgrading to typescript 4.4.3 (#896)
* Bump typescript from 4.3.5 to 4.4.3

Bumps [typescript](https://github.com/Microsoft/TypeScript) from 4.3.5 to 4.4.3.
- [Release notes](https://github.com/Microsoft/TypeScript/releases)
- [Commits](https://github.com/Microsoft/TypeScript/compare/v4.3.5...v4.4.3)

---
updated-dependencies:
- dependency-name: typescript
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

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

* (fix): extract error message

* (fix): error is unknown on __tests__

* (fix): add cover

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-10-06 23:20:55 +01:00
James Ives
f1292641bc Unit Test 2021-08-25 23:19:09 -04:00
James Ives
00fe98e4e5 Single Commit Adjustments 2021-08-25 23:16:13 -04:00
James Ives
6c2a931226
Removes the call to -D (#713)
* Removes the call to -D

* Update main.test.ts
2021-05-11 19:03:39 -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
184d104236 Update main.test.ts 2021-05-06 00:00:42 -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
9119c527be
Enables Support for Self-Hosted GitHub Instances (GitHub Enterprise) (#622)
* Adds Changes

* Update main.test.ts

* Format

* Update README.md

* Formatting
2021-03-04 08:47:44 -05:00
James Ives
442182742b
[Release] Version 4 (#589)
* Stop checking out workspace (#515)

* Stop checking out base branch before deployment, drop option.

* Don't check out default branch, as we don't check out base branch, drop option.

* Don't stash/unstash as we don't update the workdir, drop preserve option.

* Don't init the workspace

* Only fetch the remote branch if it exists, only with depth 1.

* Rely on previous checkouts to have handled lfs files correctly, drop option.

* Update README, action.yml, integration tests

* Set up eslint for test files. (#517)

* Add DRY_RUN option, passing --dry-run to git push. (#526)

See #499 for the proposal.

* Simplifies Token Setup (#530)

* Token simplification

* Access Token / Github Token -> Token

* Oops

* Typos

* Update README.md

* Update README.md

* Update action.yml

Co-authored-by: Axel Hecht <axel@pike.org>

* Update README.md

Co-authored-by: Axel Hecht <axel@pike.org>

* Update README.md

Co-authored-by: Axel Hecht <axel@pike.org>

* Adjust codeql action to latest recommendations (#540)

Also, add the dev and release branches, and drop master.

* Add workflow to update build and node_modules on release branches (#541)

* Stores username/email in secrets

* Removing stale bot integration

* Test current code base as an integration test for PRs and pushes (#505)

* Add a build step to create lib and node_modules artifact

* Run integration test with built dist and current SHA as base

For pull requests, the github.sha is the sha of the merge to the
target branch, not the head of the PR. Special case that.

* Use v2 checkout, and DRY_RUN for the integration test.

I also made the branches more generic, as there are now more of them.

* Fix #536, don't push at all on dryRun

Also add tests for dryRun and singleCommit and generateBranch
code flows.

* Try to fix dryRun on new remote branches, refactor fetch

* Try to fix dryRun, only fetch if origin branch exists

* Refactor worktree setup to include branch generation and setup for singleCommit

This is a continuation of the no-checkout work, and sadly suggested pretty
intensive changes.

* Set up git config to fix tests, also make debugging easier

* Add matrix for existing and non-existing branch

* Add matrix for singleCommit and not

* Drop GITHUB_TOKEN, add DRY_RUN to action.yml

* When deploying existing branch, add a modifcation and deploy again

* Force branch checkout to work in redeployment scenarios

* Make singleCommit easier to see in job descriptions

* Review comments

* Add a test-only property to action to test code paths with remote branch.

* Introduce TestFlag enum to signal different test scenarios to unit tests

* Fix util.test.ts

* Update worktree.ts

* Fix a few nits in tests and automation. Don't try to wordcount ls-rem… (#546)

* Fix a few nits in tests and automation. Don't try to wordcount ls-remote.

Nits in tests are around undoing changes made to the environment,
and to not modify the checkout.

* Describe suite with empty SHA

* Lowercase Inputs (#547)

* Lowercases inputs

* Adjusts workflow tests and deployment_status

* Use multi-line string for clean-exclude patterns. (#553)

As this change is subtle, I'm taking the opportunity to change
the underscore for the hyphen, which makes it less likely that
users of this action will just pass in an old json array.

* Hyphenate inputs and outputs, add step output, fix #558 (#559)

* Hyphenate inputs and outputs, add step output, fix #558

I've also tried to make the clean docs a bit clearer, and consistent
about clean being on my default. Still not totally happy with the intro
of the docs there, though.

* Add testing of step outputs to build integration tests

* Security Docs

* Integration tests

* Revert "Integration tests"

This reverts commit 639ff537d5.

* Native SSH Key Support (#569)

* SSH Key Support 🔑

* Update ssh.ts

* Update src/ssh.ts

Co-authored-by: Axel Hecht <axel@pike.org>

* README fixes/etc

* Unit Tests & README

* ssh key

* Update README.md

* Update ssh.test.ts

* Update ssh.test.ts

* Update ssh.test.ts

* Update ssh.test.ts

* Update ssh.test.ts

* Update ssh.test.ts

* Update integration.yml

Co-authored-by: Axel Hecht <axel@pike.org>

* Deployment Issues (#583)

* Update git.ts

* Tests

* Update git.ts

* Formatting

* Update src/git.ts

Co-authored-by: Axel Hecht <axel@pike.org>

* TestFlag

* Logging

* Update git.ts

Co-authored-by: Axel Hecht <axel@pike.org>

* Codespace Support (#584)

* Add files via upload

* Update README.md

* Add files via upload

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* SSH Issues (#588)

* Unsets Persisted Credentials (#587)

* Persist

* Config Setup/Tests

* Assets

* Update git.ts

* Spacing

* Update integration.yml

* Update README.md

Co-authored-by: Axel Hecht <axel@pike.org>
2021-02-05 22:05:18 -05:00
James Ives
65691af8c1 Additional 3.7.0 tests 2020-10-17 12:23:52 -04:00
James Ives
1d5e1bc6d3 Formatting for 3.7.0 2020-10-17 11:48:06 -04:00
James Ives
4d005d444f Unit tests & Adjustments for 3.7.0 2020-10-17 11:47:44 -04:00
Exuanbo
dc667b3217
Feat: add support for checking if source folder exists (#463)
* Refactor: check parameters in `init`

* Test: add test for checking if folder exist

- rm unnecessary tests

* Test: fix wrong error message

* Refactor: mv initialization functions to `run`

Refactor: rm `action.root`, `action.rootPath`

Refactor: `generateFolderPath`, `hasRequiredParameters`

Test: rm some tests for `init`, add tests for `checkParameters`
2020-10-15 10:20:15 -04:00
Exuanbo
118cd3f75b
Feat: add support for absolute paths (#449)
* Feat: add support for absolute paths

* Refactor: `generateFolderPath` to generic function

`action.root` is initialized at e42fda2d72/src/constants.ts (L98), so it should not be an optional property.

* Test: rm unnecessary tests

* Refactor: rm unused exports
2020-10-07 09:34:20 -04:00
James Ives
8912f4fdb3
Stash / Remote Changes (#435)
* Preservation Changes

* Update git.ts

* Makes adjustments
2020-09-27 14:37:43 -04:00
James Ives
9846e33967 #373 Adds LFS option 2020-09-12 17:33:19 -04:00
Tom Jenkinson
41aadfb60f
supress secret from logs if it appears multiple times (#415) 2020-09-12 17:05:57 -04:00
James Ives
33932070c3 Adds the no-verify flag to prevent pre-commit hooks from taking over the process 2020-07-27 10:29:27 -04:00
James Ives
e34188042a
Changes to CNAME and nojekyll files (#362) 2020-07-13 12:52:45 -04:00
James Ives
30a915e43b Fixes tests etc 2020-06-26 14:16:54 -04:00
James Ives
b71ad75352
Silent Settings (#347) 2020-06-26 08:18:23 -04:00
James Ives
5e3a0374ac Rollback folder check 2020-06-06 13:49:39 -04:00
James Ives
57ea9373b3 Adds check to see if folder exists 2020-06-06 10:55:49 -04:00
James Ives
5cfaab981e Fixes an issue preventing deployments 2020-05-24 12:38:27 -04:00
James Ives
db312b321e Tests 2020-05-24 12:20:25 -04:00
James Ives
adea226f67 Removes the branch 2020-05-24 11:50:24 -04:00
James Ives
0657078fb0
Removes the worktree (#309)
* Removes the worktree

* Tests
2020-05-24 10:57:49 -04:00
James Ives
f57432925b Removes the log 2020-05-14 17:56:56 -04:00
James Ives
1ada96b8f7
Deploy Status (#296)
* Deploy Status changes

* DEPLOY_STATUS -> DEPLOYMENT_STATUS
2020-05-14 17:24:32 -04:00
James Ives
2ec414d8d6 Fixes error handling and details in the readme. 2020-05-10 13:34:14 -04:00
James Ives
2f337e806c
Target Folder (#268)
* Creating target folder

* Formatting
2020-04-30 08:29:24 -04:00
James Ives
0467ae9871
Removed the need for a chmod command (#248) 2020-04-11 13:57:56 -04:00
JamesIves
74276677d4 Fixes tests 2020-04-09 07:23:17 -04:00
JamesIves
9743c0d549 Publishing Script 2020-03-31 10:14:23 -04:00
James Ives
2f96cedf7a
Single Commit (#226)
* Wipe History #1

* singleCommit

* Integration tests

* Update README.md
2020-03-30 20:44:09 -04:00
JamesIves
0be35c761f Revert "Test Typing"
This reverts commit 80968479d1.
2020-03-28 13:24:51 -04:00
JamesIves
80968479d1 Test Typing 2020-03-28 13:22:39 -04:00
JamesIves
fb344c2b78 Debugging Changes 2020-03-28 10:35:26 -04:00