diff --git a/.github/github_pushback.sh b/.github/github_pushback.sh index 337bfbb..4838b99 100755 --- a/.github/github_pushback.sh +++ b/.github/github_pushback.sh @@ -16,10 +16,16 @@ ssh-keyscan -H git.pika-os.com >> ~/.ssh/known_hosts # Commit changes to git git config --global user.name 'Github Gitea Push Back Key - Cosmo' git config --global user.email 'cosmo@pika-os.com' -git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika-first-setup -git remote set-url origin git@git.pika-os.com:custom-gui-packages/pika-first-setup +#git config --global --add safe.directory /__w/gitea-pika-first-setup/gitea-pika-first-setup + +git clone git@git.pika-os.com:custom-gui-packages/pika-first-setup + +rm -rfv ./gitea-pika-first-setup/.git +cp ./pika-first-setup/.git ./gitea-pika-first-setup/ + +cd ./gitea-pika-first-setup git add . git commit -am"Github Mirror Push Back" -git config pull.rebase true -git pull +#git config pull.rebase true +#git pull git push diff --git a/.github/workflows/github-pushback.yml b/.github/workflows/github-pushback.yml index 630c2bd..edfdde6 100644 --- a/.github/workflows/github-pushback.yml +++ b/.github/workflows/github-pushback.yml @@ -6,7 +6,7 @@ on: - main jobs: - build: + Push: runs-on: ubuntu-latest container: image: ghcr.io/pikaos-linux/pikaos-builder:nestv3 @@ -26,10 +26,6 @@ jobs: env: RUNNER_ORIGIN: ${{ secrets.RUNNER_ORIGIN }} - - uses: actions/checkout@v3 - with: - fetch-depth: 0 - - name: Install SSH key uses: shimataro/ssh-key-action@v2 with: @@ -39,6 +35,7 @@ jobs: if_key_exists: replace - name: Run - env: - SSH_AUTH_SOCK: /tmp/ssh_agent.sock - run: ./.github/github_pushback.sh + run: git clone https://github.com/PikaOS-Linux/gitea-pika-first-setup + + - name: Run + run: ./gitea-pika-first-setup/.github/github_pushback.sh