diff --git a/.github/workflows/flathub_push_main.yml b/.github/workflows/flathub_push_main.yml index 562bb0a1..e07692b8 100644 --- a/.github/workflows/flathub_push_main.yml +++ b/.github/workflows/flathub_push_main.yml @@ -21,17 +21,4 @@ jobs: env: GIT_NAME: ${{ secrets.GITNAME }} GIT_MAIL: ${{ secrets.GITMAIL }} - GITHUB_TOKEN: ${{ secrets.UPLOAD_TOKEN }} - - # - name: Commit and push changes - # uses: appleboy/git-push-action@v1.0.0 - # with: - # commit_message: "Update RetroDECK to v${{ env.RELNAME }} from RetroDECK/${{ env.RD_BRANCH }}" - # branch: "${{ env.RELNAME }}" - # path: "${{ env.FOLDER_TO_PUSH }}" - # remote: "${{ env.TARGET_REPO }}" - # tag: "v${{ env.RELNAME }} --force" - # force: true - # author_name: ${{ env.GIT_NAME }} - # author_email: ${{ env.GIT_MAIL }} - # commit: true \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.UPLOAD_TOKEN }} \ No newline at end of file diff --git a/automation_tools/flathub_push_main.sh b/automation_tools/flathub_push_main.sh index ff25a5f2..564a68c4 100755 --- a/automation_tools/flathub_push_main.sh +++ b/automation_tools/flathub_push_main.sh @@ -80,13 +80,7 @@ if [ -n "${GITHUB_WORKFLOW}" ]; then git config --local user.name "$GIT_NAME" git config --local user.email "$GIT_MAIL" git config --local credential.helper store - - # echo "https://${GIT_NAME}:${GITHUB_TOKEN}@github.com" > ~/.git-credentials - # echo "RD_BRANCH=$rd_branch" >> $GITHUB_ENV - # echo "RELNAME=$relname" >> $GITHUB_ENV - # echo "FOLDER_TO_PUSH=$gits_folder/flathub" >> $GITHUB_ENV - # echo "TARGET_REPO=https://github.com/${flathub_target_repo}" >> $GITHUB_ENV - + echo "${GITHUB_TOKEN}" | gh auth login --with-token elif [[ -z $(git config --get user.name) || -z $(git config --get user.email) ]]; then read -p "No git user.name set, please enter your name: " git_username git config --local user.name "$git_username" @@ -96,10 +90,4 @@ fi git add . git commit -m "Update RetroDECK to v$relname from RetroDECK/$rd_branch" - -if [ -n "${GITHUB_WORKFLOW}" ]; then - git push --force "https://${GITHUB_TOKEN}@github.com/${flathub_target_repo}" "$relname" -else - git push --force "https://github.com/${flathub_target_repo}" "$relname" -fi - +git push --force "https://github.com/${flathub_target_repo}" "$relname"