Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stop checking out workspace #515

Merged
merged 7 commits into from
Dec 7, 2020
Merged

Stop checking out workspace #515

merged 7 commits into from
Dec 7, 2020

Conversation

Pike
Copy link
Contributor

@Pike Pike commented Nov 30, 2020

Description

This PR removes all the functionality and options that relate to the check-out of the workspace. This removes BASE_BRANCH to begin with, but also LFS and PRESERVE. LFS should be handled by the source check-out, and as we're not switching to BASE_BRANCH anymore, PRESERVE lost its purpose.

Testing Instructions
The unit tests pass, and the number of call changes in each commit made sense to me. I'm leaning towards rebasing my PR #505 on top of this one (including an added DRY_RUN) before merging, so that we don't have to do integration testing on dev.

Additional Notes

This is a follow up to our conversation in #508

@Pike Pike requested a review from JamesIves as a code owner November 30, 2020 16:17
@Pike
Copy link
Contributor Author

Pike commented Nov 30, 2020

I've created an incremental PR for the dry-run option in https://github.com/Pike/github-pages-deploy-action/pull/1.

@JamesIves JamesIves added the version 4 Issues related to version 4 of this action. label Nov 30, 2020
@JamesIves
Copy link
Owner

Thanks! I'll take a look at these in the morning.

Copy link
Owner

@JamesIves JamesIves left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks great! I think the next step is getting this stuff into the version 4 branch so we can get some more testing on this. I think rebasing is probably a good idea and that way we can just combine this into one.

I will get stuff organized and merge this later this week. Thanks for all of your help with this!

@JamesIves JamesIves changed the base branch from dev to dev-v4 December 1, 2020 14:27
@JamesIves JamesIves merged commit 560e416 into JamesIves:dev-v4 Dec 7, 2020
@JamesIves
Copy link
Owner

Merged - also added a discussion for v4 related changes here: #524

@Pike Pike deleted the no-check-out branch December 7, 2020 20:32
@JamesIves JamesIves added this to the 4.0.0 milestone Dec 8, 2020
JamesIves added a commit that referenced this pull request Feb 6, 2021
* 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 639ff53.

* 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>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
version 4 Issues related to version 4 of this action.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants