From b72cc873c91c616715f67ed29fab77ce2fc668fc Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Mon, 12 Feb 2024 00:54:31 -0500 Subject: Switch to different action and fix bugs --- .github/workflows/release-build.yaml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/release-build.yaml b/.github/workflows/release-build.yaml index 6c0599c..9cc8b5a 100644 --- a/.github/workflows/release-build.yaml +++ b/.github/workflows/release-build.yaml @@ -50,27 +50,28 @@ jobs: target: "/srv/incoming/${{ inputs.version }}/debian/${{ matrix.arch }}/${{ matrix.release }}" - name: "Import artifacts into reprepro" - uses: nekiro/ssh-job@main + uses: appleboy/ssh-action@v1.0.3 with: host: "${{ secrets.REPO_HOST }}" - user: "${{ secrets.REPO_USER }}" + username: "${{ secrets.REPO_USER }}" key: "${{ secrets.REPO_KEY }}" - command: |- + script: | + set -o xtrace if [[ ${{ inputs.version }} == "master" ]]; then COMPONENT="unstable" else COMPONENT="unstable" fi - sudo reprepro --basedir --component ${COMPONENT} /srv/debian includedeb ${{ matrix.release }} /srv/incoming/${{ inputs.version }}/debian/${{ matrix.arch }}/${{ matrix.release }}/*.deb - sudo reprepro --basedir --component ${COMPONENT} /srv/debian includedsc ${{ matrix.release }} /srv/incoming/${{ inputs.version }}/dscian/${{ matrix.arch }}/${{ matrix.release }}/*.dsc + sudo reprepro --basedir /srv/debian --component ${COMPONENT} includedeb ${{ matrix.release }} /srv/incoming/${{ inputs.version }}/debian/${{ matrix.arch }}/${{ matrix.release }}/*.deb + sudo reprepro --basedir /srv/debian --component ${COMPONENT} includedsc ${{ matrix.release }} /srv/incoming/${{ inputs.version }}/debian/${{ matrix.arch }}/${{ matrix.release }}/*.dsc - name: "Move artifacts into repository" - uses: nekiro/ssh-job@main + uses: appleboy/ssh-action@v1.0.3 with: host: "${{ secrets.REPO_HOST }}" - user: "${{ secrets.REPO_USER }}" + username: "${{ secrets.REPO_USER }}" key: "${{ secrets.REPO_KEY }}" - command: |- + script: | sudo mkdir -p /srv/repository/mirror/releases/server/debian/versions/${{ inputs.version }}/${{ matrix.arch }} sudo mv -t /srv/repository/mirror/releases/server/debian/versions/${{ inputs.version }}/${{ matrix.arch }} /srv/incoming/${{ inputs.version }}/debian/${{ matrix.arch }}/${{ matrix.release }}/*.deb if [[ ${{ inputs.version }} != "master" ]]; then -- cgit