Skip to content
This repository was archived by the owner on Sep 30, 2024. It is now read-only.

fix(appliance): Make Appliance URL envvars strings#64227

Merged
DaedalusG merged 7 commits intomainfrom
al/REL/nav-item-for-appliance
Aug 1, 2024
Merged

fix(appliance): Make Appliance URL envvars strings#64227
DaedalusG merged 7 commits intomainfrom
al/REL/nav-item-for-appliance

Conversation

@Chickensoupwithrice
Copy link
Contributor

@Chickensoupwithrice Chickensoupwithrice commented Aug 1, 2024

Changes APPLIANCE_MANAGED -> APPLIANCE_UPDATE_TARGET, and creates APPLIANCE_MENU_TARGET. Both are stringly typed env vars, that when set will create / redirect the update buttons / menu links in the site admin and nav item pages.

Paired with @nelsonjr and @DaedalusG on this

Test plan

Manually Tested

Changelog

  • fix(appliance): make environment variables strings to be passed around

@cla-bot cla-bot bot added the cla-signed label Aug 1, 2024
@Chickensoupwithrice Chickensoupwithrice requested review from DaedalusG, craigfurman and nelsonjr and removed request for craigfurman August 1, 2024 21:38
@Chickensoupwithrice Chickensoupwithrice force-pushed the al/REL/nav-item-for-appliance branch from 4d70162 to 1992a23 Compare August 1, 2024 21:41
@DaedalusG DaedalusG merged commit 856e41e into main Aug 1, 2024
@DaedalusG DaedalusG deleted the al/REL/nav-item-for-appliance branch August 1, 2024 22:45
@sourcegraph-release-bot
Copy link
Collaborator

The backport to 5.5.x failed at https://github.com/sourcegraph/sourcegraph/actions/runs/10206878241:

The process '/usr/bin/git' failed with exit code 1

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 5.5.x -p 64227
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.5.x 5.5.x
# Navigate to the new working tree
cd .worktrees/backport-5.5.x
# Create a new branch
git switch --create backport-64227-to-5.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 856e41eff3bc36e0d87a84497692adff654e09cb
# Push it to GitHub
git push --set-upstream origin backport-64227-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-64227-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.5.x and the compare/head branch is backport-64227-to-5.5.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot sourcegraph-release-bot added backports failed-backport-to-5.5.x release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Aug 1, 2024
@DaedalusG DaedalusG removed release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases failed-backport-to-5.5.x labels Aug 1, 2024
@sourcegraph-release-bot
Copy link
Collaborator

The backport to 5.5.x failed at https://github.com/sourcegraph/sourcegraph/actions/runs/10206878241:

The process '/usr/bin/git' failed with exit code 1

To backport this PR manually, you can either:

Via the sg tool

Use the sg backport command to backport your commit to the release branch.

sg backport -r 5.5.x -p 64227
Via your terminal

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add .worktrees/backport-5.5.x 5.5.x
# Navigate to the new working tree
cd .worktrees/backport-5.5.x
# Create a new branch
git switch --create backport-64227-to-5.5.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 856e41eff3bc36e0d87a84497692adff654e09cb
# Push it to GitHub
git push --set-upstream origin backport-64227-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.x

If you encouter conflict, first resolve the conflict and stage all files, then run the commands below:

git cherry-pick --continue
# Push it to GitHub
git push --set-upstream origin backport-64227-to-5.5.x
# Go back to the original working tree
cd ../..
# Delete the working tree
git worktree remove .worktrees/backport-5.5.x
  • Follow above instructions to backport the commit.
  • Create a pull request where the base branch is 5.5.x and the compare/head branch is backport-64227-to-5.5.x., click here to create the pull request.

Once the pull request has been created, please ensure the following:

  • Make sure to tag @sourcegraph/release in the pull request description.

  • kindly remove the release-blocker from this pull request.

@sourcegraph-release-bot sourcegraph-release-bot added failed-backport-to-5.5.x release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases labels Aug 1, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

backport 5.5.x backports cla-signed failed-backport-to-5.5.x release-blocker Prevents us from releasing: https://about.sourcegraph.com/handbook/engineering/releases

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants