Merge pull request #204 from MekDrop/fix/old-wiki-updating

Fix old wiki updating

Author: fiammybe

action.yml

@@ -61,13 +61,24 @@ runs:
       shell: bash
       if: inputs.setup_php == 'true'
 
-    - name: Checkouting original wiki with needed branch...
+    - name: Cloning original wiki...
       run: |
-        bash ${{ github.action_path }}/bin/checkout.sh \
+        bash ${{ github.action_path }}/bin/cloning.sh \
           "${{ inputs.wiki_github_update_token }}" \
           "${{ inputs.wiki_github_update_user }}"
       shell: bash
 
+    - name: Configuring GIT...
+      run: |
+        bash ${{ github.action_path }}/bin/configure_git.sh \
+          "${{ inputs.wiki_github_update_user }}" \
+          "${{ inputs.wiki_github_update_user }}@users.noreply.github.com"
+      shell: bash
+
+    - name: Checkouting needed branch...
+      run: bash ${{ github.action_path }}/bin/checkout.sh
+      shell: bash
+
     - name: Generating new documentation with clean/phpdoc-md...
       uses: impresscms-dev/[email protected]
       with:
@@ -107,9 +118,7 @@ runs:
     - name: Commit and push wiki changes...
       run: |
         bash ${{ github.action_path }}/bin/commit_and_push.sh \
-          "${{ github.event.commits[0].message }}" \
-          "${{ inputs.wiki_github_update_user }}" \
-          "${{ inputs.wiki_github_update_user }}@users.noreply.github.com"
+          "${{ github.event.commits[0].message }}"
       shell: bash
 
     - name: Clearing temp paths...

bin/checkout.sh

@@ -1,21 +1,22 @@
 #!/usr/bin/env bash
 
-PRIVATE_TOKEN="$1"
-GITHUB_USER="$2"
-
-# shellcheck disable=SC2086
-git clone -q https://$GITHUB_USER:$PRIVATE_TOKEN@github.com/$GITHUB_REPOSITORY.wiki.git "$OLD_WIKI_CHECKOUT_PATH"
-
 # shellcheck disable=SC2164
 pushd "$OLD_WIKI_CHECKOUT_PATH"
 
-  if git show-ref -q --heads "$GITHUB_REF_NAME"; then
+  git ls-remote -q --heads --exit-code origin "$GITHUB_REF_NAME" > /dev/null
+  REMOTE_CHECK_EXIT_CODE=$?
+
+  git show-ref -q --heads "$GITHUB_REF_NAME" > /dev/null
+  LOCAL_CHECK_EXIT_CODE=$?
+
+  if [ "$REMOTE_CHECK_EXIT_CODE" -gt 0 ] || [ "$LOCAL_CHECK_EXIT_CODE" -gt 0 ]; then
+    echo "Remote '$GITHUB_REF_NAME' found."
     git checkout "$GITHUB_REF_NAME"
   else
+    echo "Remote '$GITHUB_REF_NAME' not found. Creating."
     git checkout -b "$GITHUB_REF_NAME"
+    git push --set-upstream origin "$GITHUB_REF_NAME"
   fi;
 
-  git branch --set-upstream-to=origin/$GITHUB_REF_NAME "$GITHUB_REF_NAME"
-
 # shellcheck disable=SC2164
 popd

bin/cloning.sh

@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+
+PRIVATE_TOKEN="$1"
+GITHUB_USER="$2"
+
+# shellcheck disable=SC2086
+git clone -q https://$GITHUB_USER:$PRIVATE_TOKEN@github.com/$GITHUB_REPOSITORY.wiki.git "$OLD_WIKI_CHECKOUT_PATH"
+
+if [ ! -d "$OLD_WIKI_CHECKOUT_PATH" ]; then
+  echo "ERROR: wiki directory not created. Perhaps You didn't created at least one web page?"
+  exit 1
+fi

bin/commit_and_push.sh

@@ -7,26 +7,19 @@ COMMITER_EMAIL="$3"
 # shellcheck disable=SC2164
 pushd "$NEW_WIKI_CHECKOUT_PATH"
 
-  echo "Configuring GIT..."
-  git config user.email "$COMMITER_EMAIL" || exit 1
-  git config user.name "$COMMITER_NAME" || exit 2
-  git config advice.addEmptyPathspec false
-  git config pull.rebase false
-  git config advice.skippedCherryPicks false
-  git config advice.setUpstreamFailure false
+  git branch -a
 
   echo "Adding changes to GIT..."
   git add -A --verbose
 
-  echo "Commiting..."
+  echo "Committing..."
   git commit -m "$COMMIT_MESSAGE"
 
   echo "Pulling and merging from remote..."
-  git branch --set-upstream-to=origin/$GITHUB_REF_NAME "$GITHUB_REF_NAME" || true
   git pull -s recursive -X ours || true
 
   echo "Pushing to remote..."
-  git push --set-upstream origin "$GITHUB_REF_NAME" || exit 3
+  git push || exit 1
 
 # shellcheck disable=SC2164
 popd

bin/configure_git.sh

@@ -0,0 +1,20 @@
+COMMITER_NAME="$1"
+COMMITER_EMAIL="$2"
+
+# shellcheck disable=SC2164
+pushd "$OLD_WIKI_CHECKOUT_PATH"
+
+  if [ "$COMMITER_NAME" == "" ]; then
+    echo "ERROR: 'wiki_github_update_user' not set"
+    exit 3
+  fi;
+
+  git config user.email "$COMMITER_EMAIL" || exit 1
+  git config user.name "$COMMITER_NAME" || exit 2
+  git config advice.addEmptyPathspec false
+  git config pull.rebase false
+  git config advice.skippedCherryPicks false
+  git config advice.setUpstreamFailure false
+
+# shellcheck disable=SC2164
+popd