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

Staging -> Main #458

Merged
merged 8 commits into from
Feb 11, 2022
Merged

Staging -> Main #458

merged 8 commits into from
Feb 11, 2022

Conversation

cansavvy
Copy link
Collaborator

Purpose/implementation Section

What changes are being implemented in this Pull Request?

There's some things we need to test (like changes from #449 ) that won't really work unless they are in the default branch (which is main) So here we go.

cansavvy and others added 8 commits February 8, 2022 15:19
* Return to pre-gist method of spell check (#409)

* Return to pre-gist method of spell check

* Get rid of gist stuff on delete-preview too

* Temporarily add spelling errors to test

* Commit before testing

* Switch to use -z

* Fix git diff step

* Just look at the local main since it should be up to date

* make it simple

* Get rid of double bracket

* No brackets?

* Revert "Temporarily add spelling errors to test"

This reverts commit 9e9a932.

* Update screenshot for new repo (#410)

* Update template button screenshot (#411)

* Update screenshot for new repo

* Update template button too

* See if `fetch-depth: 0` fixes the shallow problem (#412)

* Update screenshot for new repo

* Update template button too

* fetch it all

* Switch to devtools::session_info()

* Render bookdown

* Update screenshot for git-secret.png (#414)

* Update screenshot for git-secret.png

* Crop off irrelevant git secrets

* syntax updates

* Needed a semicolon

* Fix branch handling

* Update spell check set up

* Update main

* add brackets

* set shell intentionally

* fix if statements

* Create PR if it can't push directly

* Make sure it merges

* Alter branch test

* quote the 0?

* switch to -z

* Delete extra then

* This should work

* Change to preview- again whoops

* Add a push step

* Update starting course

* set upstream

* Set to bash intentionally (#419)

* set to bash

* Update

* no workflow dispatch

* Test leanpub from here (#420)

* Test leanpub from here

* Update comments

* Add check quizzes too

* Couple edits

* Shut them off for now

* Update comments

* Render leanpub

* Minor polishing of steps (#421)

* Test leanpub from here

* Update comments

* Add check quizzes too

* Couple edits

* Shut them off for now

* Update comments

* Note which places needed to be uncommented

* Just making the step clearer

* Add a git fetch

* Add quizzes to spell check

* Update README.md

* Render leanpub

* Add new repository to sync

* Polish Examples in Rmds (#426)

* Echo false in examples

* Updating wiki

* Render bookdown

* Render bookdown (#427)

* Prep for ottr rename (#428)

* Render bookdown

* Make docker unfail (#431)

* Make docker not fail

* Add Dockerfile example

* Get rid of extra line

* Skip build for this test

* comment out push part too for this test

* undo test Dockerfile

* Render bookdown

* Try out screenshot creator as a part of the new Leanpub set up  (#422)

* Try out screenshot creator

* Fix spacing

* Get rid of typo

* fix argument spec

* Fix git pat handling

* Add copy over assets step

* Try this

* Try installing just the packages we need

* Add install of remotes

* Try using devtools instead

* try set environ

* Try to install R first

* Add prereqs

* Try rocker r-base

* Put installations in script

* Try different strategy

* Switch to tidyverse

* Make directory in bash

* I guess I'm making this its own docker image

* This isn't working but I want it in case I come back to it

* Switch to wkhtmltopdf

* Lets' try it

* Trying leanbuild steps on their own dockerfile

* Test build of leanbuild docker image

* Try out webshot r package

* fix file path to script

* Oh. Actually fix it

* Try installing webshot::install_phantomjs

* Try installing phantomjs on its own first

* Set this up

* Build from jhudsl/course_template

* Switch back to main dockerfile

* assets problem

* It works!

* Revert "assets problem"

This reverts commit 2aada9b.

* Add markdown maker basics

* Push this version before I delete things

* Clean up

* Delete the pdfs

* Reconfig with latest ottr package changes

* Turn on render again

* Add PR instead

* Move copying step

* Add an :: that was missing

* Fix arguments for getting pages url

* misplaced quotes

* Add make_book_txt = TRUE

* It's working! Undo the commenting part

* Set base to main

* Revert "It's working! Undo the commenting part"

This reverts commit 92e5081.

* rm manuscript folder

* Just commit to main

* Delete old manuscript files

* Copy over assets

* Render bookdown

* Remove manuscript if it is there

* Set group and user id to get rid of permissions probs

* Forgot \ 's

* Render bookdown

* Make it force push

* only force manuscript dir

* Render Leanpub

* Render Leanpub

* Render Leanpub

* Add to transfer PRs

* Delete manuscript folder

* Add to sync.yml

* Render Leanpub

* Remove _Template bit

* Add coursera bit and _Quizzes

* Clean out manuscript folder when starting new course

* Make transfers go to the right folder

* add /

* Update sync.yml with OTTR_Template_Website (#437)

Co-authored-by: jhudsl-robot <itcrtrainingnetwork@gmail.com>

Co-authored-by: GitHub Actions <actions@github.com>
Co-authored-by: jhudsl-robot <97678365+jhudsl-robot@users.noreply.github.com>
Co-authored-by: Tiffany Miller <tiffanym@broadinstitute.org>
Co-authored-by: jhudsl-robot <itcrtrainingnetwork@gmail.com>
* Create config_automation.yml

* Update style-and-sp-check.yml

* Update the filename 😑

* Checking dependency

* Update style-and-sp-check.yml

* Testing that file is carried over

* Add toggle to second check

* Change config to test

* Test removal of some extra text

* Change config to test (again)

* Update config_automation.yml

* What does the output look like with more checks added?

* Fix spacing

* Forgot "steps:"

* BIG YAML

* Get rid of other ones

* Fix names

* Add needs

* Try adding docker to it

* Fix syntax

* Gotta check it out first

* Extra "if" lying around

* Set logically differently

* Testing change

* Add Ava's suggestions!

Co-authored-by: AM Hoffman <avamariehoffman@gmail.com>
* Create config_automation.yml

* Update style-and-sp-check.yml

* Update the filename 😑

* Checking dependency

* Update style-and-sp-check.yml

* Testing that file is carried over

* Add toggle to second check

* Change config to test

* Test removal of some extra text

* Change config to test (again)

* Update config_automation.yml

* What does the output look like with more checks added?

* Fix spacing

* Forgot "steps:"

* BIG YAML

* Get rid of other ones

* Fix names

* Add needs

* Try adding docker to it

* Make a render-all yaml

* Fix syntax

* Gotta check it out first

* Extra "if" lying around

* Set logically differently

* Echo no branch to delete if there is none to delete

* Update sync.yml

* fix syntax

* Fix name of render-all

* Add names

Co-authored-by: AM Hoffman <avamariehoffman@gmail.com>
@github-actions
Copy link
Contributor

No spelling errors! 🎉
Comment updated at 2022-02-11 with changes from 1be101a

@github-actions
Copy link
Contributor

No quiz errors detected! 🎉
Comment updated at 2022-02-11 with changes from 1be101a

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant