Skip to content

Commit

Permalink
Merge pull request #13 from aaroncastro1990/branching_updates
Browse files Browse the repository at this point in the history
updating github actions to trigger on `main` branch
  • Loading branch information
sbarnhart authored Apr 11, 2024
2 parents 9c545fa + 232bbda commit 137743a
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 11 deletions.
19 changes: 10 additions & 9 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@ name: "Docs - Build"
on:
push:
branches:
- master
- main
tags:
- release*
pull_request:
branches:
- master
- main

env:
# HOME required by Setup Git and Setup Go Steps
Expand All @@ -25,15 +25,15 @@ jobs:
- check_links
steps:
# SSH Agent Setup required for git to pull modules from private repos
- name: SSH Agent Setup
uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.GLOBAL_FLEXERA_CI_PRIVATE_SSH_KEY }}
# - name: SSH Agent Setup
# uses: webfactory/[email protected]
#with:
# ssh-private-key: ${{ secrets.GLOBAL_FLEXERA_CI_PRIVATE_SSH_KEY }}
- name: Checkout so we can get build tags
uses: actions/checkout@v2
uses: actions/checkout@v3
with:
fetch-depth: 0
ssh-key: ${{ secrets.GLOBAL_FLEXERA_CI_PRIVATE_SSH_KEY }}
token: ${{ secrets.GITHUB_TOKEN }}
submodules: recursive
- name: Setup Environment Variables
env:
Expand Down Expand Up @@ -86,8 +86,9 @@ jobs:

- name: Update git config
run: |
git config --global user.email "TravisCI"
git config --global user.email "Github Actions"
git config --global user.name "Automated Deployment"
git config --global url."[email protected]:".insteadOf "https://github.com"
- name: Script
run: |
Expand Down
4 changes: 2 additions & 2 deletions util/versionize-rl10-docs.rb
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
new_ver = ARGV[1]

remote_url = `git config --list | grep remote.origin.url`
unless remote_url.include?('rightscale/docs')
unless remote_url.include?('flexera-public/rightscale-docs')
raise "Run this from the docs repo"
end

Expand All @@ -24,7 +24,7 @@
raise "Cannot find #{old_dir}" unless File.exists?(old_dir)


system('git checkout master && git pull') or raise "Failed to checkout master && pull"
system('git checkout main && git pull') or raise "Failed to checkout main && pull"
new_branch = "RightLink_#{new_ver}_release"
make_branch = `git branch`.include?(new_branch) ? '' : '-b'
system("git checkout #{make_branch} #{new_branch}") or raise "Failed to make/use git branch #{new_branch}"
Expand Down

0 comments on commit 137743a

Please sign in to comment.