[shiro-site] branch staging-fix updated (83dde55 -> dbc4b81)

[bm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a change to branch staging-fix
in repository https://gitbox.apache.org/repos/asf/shiro-site.git.


 discard 83dde55  fix typo for staging action.
     new dbc4b81  fix typo for staging action.

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (83dde55)
            \
             N -- N -- N   refs/heads/staging-fix (dbc4b81)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .github/workflows/staging.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

[shiro-site] 01/01: fix typo for staging action.

[bm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

bmarwell pushed a commit to branch staging-fix
in repository https://gitbox.apache.org/repos/asf/shiro-site.git

commit dbc4b81bd2ab25e9a3cf286b314a2fedd4de204a
Author: Benjamin Marwell <bm...@apache.org>
AuthorDate: Tue Mar 22 16:44:36 2022 +0100

    fix typo for staging action.
---
 .github/workflows/staging.yml | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index b646c7c..f3bb7ca 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -15,7 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
-name: Stage main branch
+# This action will make the current branch available
+# under https://shiro.staged.apache.org/
+name: Stage current branch
 
 on:
   workflow_dispatch: {}
@@ -29,15 +31,12 @@ jobs:
       - name: 'Checkout main'
         uses: actions/checkout@v2
         with:
-          ref: 'main'
           path: 'src'
           persist-credentials: false
 
-      - run: sed -i.bak 's/site.host=.*/site.host=https:\/\/shiro.staged.apache.org\//g' jbake.properties && rm jbake.properties.bak
-        shell: bash
-        working-directory: ./src
-
-      - run: mv src/site/asssets/robots.staging.txt src/site/asssets/robots.txt
+      - run: |
+          sed -i.bak 's/site.host=.*/site.host=https:\/\/shiro.staged.apache.org\//g' jbake.properties && rm jbake.properties.bak
+          mv src/site/assets/robots.staging.txt src/site/assets/robots.txt
         shell: bash
         working-directory: ./src
 
@@ -57,6 +56,16 @@ jobs:
           path: 'site-staging'
 
       - name: 'Copy to staging'
-        run: rsync -avP src/target/website/. ../site-staging && git commit -a -m "staging $(date -Is)" && git push
+        run: |
+          rsync -a src/target/website/. ./site-staging 
+        shell: bash
+
+      - name: 'commit staging'
+        working-directory: ./site-staging
+        run: |
+          git config user.name "GitHub Actions Bot"
+          git config user.email "<>"
+          git commit -a -m "staging $(date -Is)" 
+          git push
         shell: bash