From d16e84675c28d76d87b944ddf53eca13ee8c4315 Mon Sep 17 00:00:00 2001 From: Anairkoen Schno Date: Thu, 26 Mar 2020 16:43:40 -0500 Subject: [PATCH] Adjusted actions files --- .github/workflows/docs.yml | 11 ----------- .github/workflows/tag_docs.yml | 11 +---------- BSIPA.sln | 2 ++ 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index 35675ce1..45f0e3f6 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -56,14 +56,11 @@ jobs: Move-Item "$env:ORIGIN_SITE/.git" _site Move-Item "$env:ORIGIN_SITE/$env:TAGS_DIR" _site Move-Item "$env:ORIGIN_SITE/$env:BRANCH_DIR" _site - cd _site $ErrorActionPreference = "SilentlyContinue" git add -A 2>&1 - $srcMessage = (git show -s --format=%B $env:GITHUB_SHA) -join "`n" git commit -q -a -m "Generated Docs -- $srcMessage" - git push -q origin gh-pages if: github.ref == 'refs/heads/master' - name: Publish branch site to GitHub pages @@ -71,29 +68,21 @@ jobs: working-directory: ./docs run: | $ErrorActionPreference = "Continue" - $branchName = (git rev-parse --abbrev-ref=loose $env:GITHUB_REF) -join "" $srcMessage = (git show -s --format=%B $env:GITHUB_SHA) -join "`n" - cd $env:ORIGIN_SITE - if (-Not (Test-Path $env:BRANCH_DIR)) { New-Item -ItemType directory -Path $env:BRANCH_DIR } - $branchPath = "$env:BRANCH_DIR/$branchName" if (Test-Path $branchPath) { # force remove it Get-ChildItem -Path $branchPath -Recurse | Remove-Item -Force -Recurse Remove-Item $branchPath -Force } - # move generated into place Move-Item ../_site $branchPath - git add -A 2>&1 - git commit -q -a -m "Generated Docs ($branchName) -- $srcMessage" - git push -q origin gh-pages if: github.ref != 'refs/heads/master' diff --git a/.github/workflows/tag_docs.yml b/.github/workflows/tag_docs.yml index 07686cd3..155a64ce 100644 --- a/.github/workflows/tag_docs.yml +++ b/.github/workflows/tag_docs.yml @@ -53,28 +53,19 @@ jobs: working-directory: ./docs run: | $ErrorActionPreference = "Continue" - $tagName = (git rev-parse --abbrev-ref=loose $env:GITHUB_REF) -join "" - cd $env:ORIGIN_SITE - if (-Not (Test-Path $env:TAGS_DIR)) { New-Item -ItemType directory -Path $env:TAGS_DIR } - $tagPath = "$env:TAGS_DIR/$tagName" if (Test-Path $tagPath) { # force remove it Get-ChildItem -Path $tagPath -Recurse | Remove-Item -Force -Recurse Remove-Item $tagPath -Force } - # move generated into place Move-Item ../_site $tagPath - git add -A 2>&1 - git commit -q -a -m "Saved tag $tagName" - - git push -q origin gh-pages - \ No newline at end of file + git push -q origin gh-pages \ No newline at end of file diff --git a/BSIPA.sln b/BSIPA.sln index d11acd5f..e36b81dc 100644 --- a/BSIPA.sln +++ b/BSIPA.sln @@ -29,7 +29,9 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4D6639A2-BD39-4F9B-AF7F-8E5F3B88243D}" ProjectSection(SolutionItems) = preProject appveyor.yml = appveyor.yml + .github\workflows\docs.yml = .github\workflows\docs.yml README.md = README.md + .github\workflows\tag_docs.yml = .github\workflows\tag_docs.yml EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CollectDependencies", "BuildTools\CollectDependencies\CollectDependencies.csproj", "{5F33B310-DC8D-4C0D-877E-BAC3908DE10F}"