diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 33bd3449..f22d9575 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -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 @@ -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/ssh-agent@v0.5.3 - with: - ssh-private-key: ${{ secrets.GLOBAL_FLEXERA_CI_PRIVATE_SSH_KEY }} + # - name: SSH Agent Setup + # uses: webfactory/ssh-agent@v0.5.3 + #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: @@ -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."git@github.com:".insteadOf "https://github.com" - name: Script run: | diff --git a/util/versionize-rl10-docs.rb b/util/versionize-rl10-docs.rb index 0f980b3e..7f95a0cc 100644 --- a/util/versionize-rl10-docs.rb +++ b/util/versionize-rl10-docs.rb @@ -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 @@ -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}"