Rework new deploy script into single script & add scheduled redeploy #1950

iMarbot · 2022-09-26T04:51:01Z

Summary

Continuing the previous PR forward into the discussed merge of shell scripts into one. Plus adding scheduled deploy action once a week.

Things of note

I left the HTTP Auth header in the curl requests since it was just easier and it doesn't break anything. Idk if you guys want to only have them there if it's dev wiki but I didn't know of a clean and easy way to do it, so I left them for now.
I added an if statement around the rm cookie_* at the end because it would throw an error otherwise when they didn't exist due to no lua files being modified.

How did you test this change?

Tested on my fork of the repo as usual.

Scheduled script seems to work:

Dev wiki deployment also works:

http://darkrai.wiki.tldev.eu/commons/index.php?title=Module:Testing&action=history

So, I'm sure full wiki deploy would also work but I just didn't give it any MediaWiki credentials so the API returned that I wasn't authorized to make those changes:

Should run every Monday at 00:00 UTC

mbergen

LGTM

.github/workflows/deploy.yml

.github/workflows/scheduled.yml

deploy.sh

.github/workflows/scheduled.yml

deploy.sh

Co-authored-by: mbergen <mail@mbergen.de>

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

FO-nTTaX · 2022-09-26T13:33:03Z

deploy.sh

    wiki="${BASH_REMATCH[1]}"
    page="${BASH_REMATCH[2]}"
+
+    if [[ ! ($wikiBaseUrl == "${lpBaseUrl}" ||  "${devWikis[*]}" =~ ${wiki}) ]]; then


The order of operations here is confusing tbh, can this be put in parentheses?

Is it better now or did you mean something else?

deploy.sh

.github/workflows/deploy.yml

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

.github/workflows/deploy.yml

deploy.sh

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

* Add TF wiki * Modify `./` handling * Move URLs to secrets * Clarify `if` statement

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

iMarbot · 2022-09-26T21:35:42Z

@FO-nTTaX I added this code here so we can detect if the MW API doesn't return success. Are you okay with this change?

Lua-Modules/deploy.sh

Lines 118 to 122 in 284e92d

    
           if [[ "${result}" == "Success" ]]; then 
        
             echo "...${result}" 
        
           else 
        
             exit 1 
        
           fi

iMarbot · 2022-09-26T21:37:28Z

All changes have been tested in my repo fork but as always, it's possible I did miss something.

Rathoz

LGTM, think there's potential for improvements around the dev wiki handling, but we that can be put to a later date

deploy.sh

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

iMarbot · 2022-09-26T22:00:42Z

LGTM, think there's potential for improvements around the dev wiki handling, but we that can be put to a later date

Yeah FO had suggested something like --dev but when I looked into how to do that in bash, I didn't find any clean way to do it. Maybe it's because I don't know bash well but my googling didn't result in anything I felt was clean to use.

FO-nTTaX · 2022-09-27T10:31:40Z

I added this code here so we can detect if the MW API doesn't return success. Are you okay with this change?

Works for me

FO-nTTaX

I think this is good to go now

FO-nTTaX · 2022-09-27T10:48:09Z

LGTM, think there's potential for improvements around the dev wiki handling, but we that can be put to a later date

Yeah FO had suggested something like --dev but when I looked into how to do that in bash, I didn't find any clean way to do it. Maybe it's because I don't know bash well but my googling didn't result in anything I felt was clean to use.

https://en.wikipedia.org/wiki/Getopts#Using_Linux_getopt In case you ever want to know how to do it

* Update deploy.yml * Update deploy.sh * Update deploy.yml * Update deploy_dev.yml * Update deploy_dev.sh * Update deploy.yml * Update deploy_dev.yml * Finalize deploy changes * code style * fix for multi-file changing commits * remove double space * action will potentially fail without this * action will potentially fail without this * Rework new deploy script into single script & add scheduled redeploy (#1950) * Merge dev stuff into combined deploy * Delete deploy_dev.sh * Merge deploy actions * Add scheduled deploy action Should run every Monday at 00:00 UTC * Update deploy.yml * fix swapped env blocks * Fix incorrect script call Co-authored-by: mbergen <mail@mbergen.de> * Update cron times Co-authored-by: Rikard Blixt <rikardblixt@gmail.com> * Only run bash script if files have been modified Co-authored-by: Rikard Blixt <rikardblixt@gmail.com> * Further only run bash script if files have been modified Co-authored-by: Rikard Blixt <rikardblixt@gmail.com> * Apply all suggestions/requests * Add TF wiki * Modify `./` handling * Move URLs to secrets * Clarify `if` statement * Throw error is MW API doesn't return Success * Bump version Co-authored-by: Rikard Blixt <rikardblixt@gmail.com> * Swap around if statement Co-authored-by: Rikard Blixt <rikardblixt@gmail.com> Co-authored-by: mbergen <mail@mbergen.de> Co-authored-by: Rikard Blixt <rikardblixt@gmail.com> Co-authored-by: mbergen <mail@mbergen.de> Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

iMarbot added 6 commits September 26, 2022 05:20

Merge dev stuff into combined deploy

3cf4c81

Delete deploy_dev.sh

7fb5ffc

Merge deploy actions

9787f5f

Add scheduled deploy action

37a648a

Should run every Monday at 00:00 UTC

Update deploy.yml

2ac0492

fix swapped env blocks

af653f8

iMarbot added the scripts label Sep 26, 2022

iMarbot requested review from FO-nTTaX, Rathoz, hjpalpha and mbergen September 26, 2022 04:51

iMarbot mentioned this pull request Sep 26, 2022

Update github actions deploy to only check modified files #1945

Merged

iMarbot changed the title ~~Updated deploy continued~~ Rework new deploy script into single script & add scheduled redeploy Sep 26, 2022

mbergen reviewed Sep 26, 2022

View reviewed changes

.github/workflows/deploy.yml Outdated Show resolved Hide resolved

.github/workflows/scheduled.yml Outdated Show resolved Hide resolved

.github/workflows/scheduled.yml Outdated Show resolved Hide resolved

Rathoz reviewed Sep 26, 2022

View reviewed changes

iMarbot and others added 2 commits September 26, 2022 12:58

Fix incorrect script call

5af2b48

Co-authored-by: mbergen <mail@mbergen.de>

Update cron times

8226b4e

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

FO-nTTaX reviewed Sep 26, 2022

View reviewed changes

deploy.sh Outdated Show resolved Hide resolved

FO-nTTaX reviewed Sep 26, 2022

View reviewed changes

deploy.sh Outdated Show resolved Hide resolved

FO-nTTaX reviewed Sep 26, 2022

View reviewed changes

deploy.sh Outdated Show resolved Hide resolved

FO-nTTaX reviewed Sep 26, 2022

View reviewed changes

.github/workflows/deploy.yml Show resolved Hide resolved

Rathoz reviewed Sep 26, 2022

View reviewed changes

.github/workflows/deploy.yml Show resolved Hide resolved

Only run bash script if files have been modified

9ac9ae9

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

Rathoz reviewed Sep 26, 2022

View reviewed changes

.github/workflows/deploy.yml Show resolved Hide resolved

Rathoz reviewed Sep 26, 2022

View reviewed changes

deploy.sh Outdated Show resolved Hide resolved

iMarbot and others added 4 commits September 26, 2022 21:14

Further only run bash script if files have been modified

01b2a79

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

Apply all suggestions/requests

b509bdc

* Add TF wiki * Modify `./` handling * Move URLs to secrets * Clarify `if` statement

Throw error is MW API doesn't return Success

d942761

Bump version

284e92d

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

iMarbot requested review from FO-nTTaX, Rathoz and mbergen September 26, 2022 21:36

Rathoz approved these changes Sep 26, 2022

View reviewed changes

deploy.sh Outdated Show resolved Hide resolved

Swap around if statement

09230fd

Co-authored-by: Rikard Blixt <rikardblixt@gmail.com>

FO-nTTaX approved these changes Sep 27, 2022

View reviewed changes

iMarbot merged commit c561dd8 into updated-deploy Sep 27, 2022

FO-nTTaX deleted the updated-deploy-continued branch September 27, 2022 11:02

Rework new deploy script into single script & add scheduled redeploy #1950

Rework new deploy script into single script & add scheduled redeploy #1950

Uh oh!

Conversation

iMarbot commented Sep 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Things of note

How did you test this change?

Uh oh!

mbergen left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

FO-nTTaX Sep 26, 2022

Choose a reason for hiding this comment

Uh oh!

iMarbot Sep 26, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

iMarbot commented Sep 26, 2022

Uh oh!

iMarbot commented Sep 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Rathoz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

iMarbot commented Sep 26, 2022

Uh oh!

FO-nTTaX commented Sep 27, 2022

Uh oh!

FO-nTTaX left a comment

Choose a reason for hiding this comment

Uh oh!

FO-nTTaX commented Sep 27, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

iMarbot commented Sep 26, 2022 •

edited

Loading

iMarbot commented Sep 26, 2022 •

edited

Loading