Skip to content

Commit

Permalink
Adding upmerge workflow
Browse files Browse the repository at this point in the history
Signed-off-by: willdavsmith <[email protected]>
  • Loading branch information
willdavsmith committed Apr 15, 2024
1 parent 192414e commit e1c3025
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 9 deletions.
23 changes: 18 additions & 5 deletions .github/workflows/upmerge.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
name: Upmerge docs to edge
name: Upmerge samples to edge

on:
workflow_dispatch:
inputs:
version:
description: 'Branch name (e.g. v0.32)'
required: true
default: ''
type: string

jobs:
upmerge:
Expand All @@ -17,12 +23,19 @@ jobs:
git config --global user.name "Radius CI Bot"
- name: Create new branch
run: |
export DATE=$(date +%Y-%m-%d) >> $GITHUB_ENV
git checkout -b upmerge/$DATE
export DATE=$(date +%Y-%m-%d)
export RAND=$(openssl rand -hex 2)
git checkout -b upmerge/$DATE-$RAND
# - name: Upmerge docs
# run: |
# export SOURCE_BRANCH=$(basename ${{ github.ref }})
# echo "Upmerging samples from $SOURCE_BRANCH to edge"
# git fetch origin $SOURCE_BRANCH
# git merge --no-commit origin/$SOURCE_BRANCH
- name: Upmerge docs
run: |
export SOURCE_BRANCH=$(basename ${{ github.ref }})
echo "Upmerging docs from $SOURCE_BRANCH to edge"
export SOURCE_BRANCH=${{ inputs.version }}
echo "Upmerging samples from $SOURCE_BRANCH to edge"
git fetch origin $SOURCE_BRANCH
git merge --no-commit origin/$SOURCE_BRANCH
- name: Commit changes
Expand Down
8 changes: 4 additions & 4 deletions docs/config.toml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
baseURL = "https://edge.docs.radapp.io/"
baseURL = "https://docs.radapp.io/"
languageCode = "en-us"
title = "Radius Docs"
theme = "docsy"
Expand Down Expand Up @@ -67,17 +67,17 @@ tag = "tags"

[params]
copyright = "Radius"
version = "edge"
version = "v0.32"
tag_version = "latest"
chart_version = "0.26.0"
chart_version = "0.32.0"

# Algolia Search
algolia_docsearch = true

# GitHub Information
github_repo = "https://github.com/radius-project/docs"
github_subdir = "docs"
github_branch = "edge"
github_branch = "v0.32"
github_project_repo = "https://github.com/radius-project/radius"

# Versioning
Expand Down

0 comments on commit e1c3025

Please sign in to comment.