diff --git a/.github/workflows/ci-suite.yml b/.github/workflows/ci-suite.yml index 61ff962a4b..c66fc28fb0 100644 --- a/.github/workflows/ci-suite.yml +++ b/.github/workflows/ci-suite.yml @@ -896,6 +896,7 @@ jobs: - name: Execute Build Script env: + PACKAGING_KEYGRIP: ${{ vars.PACKAGING_KEYGRIP }} PACKAGING_PRIVATE_KEY_PASSPHRASE: ${{ secrets.PACKAGING_PRIVATE_KEY_PASSPHRASE }} run: sudo -E build/package/deb/build_package.sh @@ -903,20 +904,20 @@ jobs: run: | echo "TGS_VERSION=$(xmlstarlet sel -N X="http://schemas.microsoft.com/developer/msbuild/2003" --template --value-of /X:Project/X:PropertyGroup/X:TgsCoreVersion build/Version.props)" >> $GITHUB_ENV - - name: Validate .dsc Signature - run: gpg --verify tgstation-server_${{ env.TGS_VERSION }}-1.dsc + - name: Validate Signatures + run: | + gpg --verify tgstation-server_${{ env.TGS_VERSION }}-1.dsc + gpg --verify tgstation-server_${{ env.TGS_VERSION }}-1_amd64.changes + gpg --verify tgstation-server_${{ env.TGS_VERSION }}-1_amd64.buildinfo - - name: Upload .deb Artifact + - name: Create Packaging Archive + run: tar cfJ tgstation-server-v${{ env.TGS_VERSION }}.debian.packaging.tar.xz tgstation-server_* + + - name: Upload Packaging Archive uses: actions/upload-artifact@v3 with: - name: package-deb-${{ matrix.arch }} - path: tgstation-server_${{ env.TGS_VERSION }}-1_${{ matrix.arch }}.deb - - - name: Upload .dsc Artifact - uses: actions/upload-artifact@v3 - with: - name: package-dsc - path: tgstation-server_${{ env.TGS_VERSION }}-1.dsc + name: packaging-debian + path: tgstation-server-v${{ env.TGS_VERSION }}.debian.packaging.tar.xz deployment-gate: name: Deployment Gate @@ -1112,17 +1113,11 @@ jobs: name: openapi-spec path: swagger - - name: Retrieve amd64 .deb + - name: Retrieve Debian Packaging Archive uses: actions/download-artifact@v3 with: - name: package-deb-amd64 - path: package-deb-amd64 - - - name: Retrieve .dsc - uses: actions/download-artifact@v3 - with: - name: package-dsc - path: package-dsc + name: packaging-debian + path: packaging-debian - name: Zip Artifacts shell: powershell @@ -1197,25 +1192,15 @@ jobs: asset_name: ServerUpdatePackage.zip asset_content_type: application/zip - - name: Upload amd64 .deb Artifact + - name: Upload Debian Pacakaging Artifact uses: actions/upload-release-asset@v1 env: GITHUB_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }} with: upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./package-deb-amd64/tgstation-server_${{ env.TGS_VERSION }}-1_amd64.deb - asset_name: tgstation-server_${{ env.TGS_VERSION }}-1_amd64.deb - asset_content_type: application/vnd.debian.binary-package - - - name: Upload .dsc Artifact - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.DEV_PUSH_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: ./package-dsc/tgstation-server_${{ env.TGS_VERSION }}-1.dsc - asset_name: tgstation-server_${{ env.TGS_VERSION }}-1.dsc - asset_content_type: application/octet-stream + asset_path: ./packaging-debian/tgstation-server-v${{ env.TGS_VERSION }}.debian.packaging.tar.xz + asset_name: tgstation-server-v${{ env.TGS_VERSION }}.debian.packaging.tar.xz + asset_content_type: application/x-tar deploy-docker: name: Deploy TGS (Docker) @@ -1258,4 +1243,4 @@ jobs: - name: Trigger tgstation-ppa workflow run: | - curl -XPOST -u "${{ secrets.DEV_PUSH_USERNAME }}:${{ secrets.DEV_PUSH_TOKEN }}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/tgstation/tgstation-ppa/actions/workflows/add_tgs_version.yml/dispatches --data '{"ref":"main","inputs":{"tgs_semver": "${{ env.TGS_VERSION }}"}}' + curl -XPOST -u "${{ vars.DEV_PUSH_USERNAME }}:${{ secrets.DEV_PUSH_TOKEN }}" -H "Accept: application/vnd.github.everest-preview+json" -H "Content-Type: application/json" https://api.github.com/repos/tgstation/tgstation-ppa/actions/workflows/add_tgs_version.yml/dispatches --data '{"ref":"main","inputs":{"tgs_semver": "${{ env.TGS_VERSION }}"}}' diff --git a/build/package/deb/build_package.sh b/build/package/deb/build_package.sh index 442fe506db..54063487dc 100755 --- a/build/package/deb/build_package.sh +++ b/build/package/deb/build_package.sh @@ -42,10 +42,10 @@ rm -f /tmp/tgs_wrap_gpg_output.log set +e -if [[ -z "$PACKAGING_PRIVATE_KEY_PASSPHRASE" ]]; then +if [[ -z "$PACKAGING_KEYGRIP" ]]; then dpkg-buildpackage --no-sign else - dpkg-buildpackage --sign-key=ad03052d1740533e --sign-command="$SIGN_COMMAND" + dpkg-buildpackage --sign-key=$PACKAGING_KEYGRIP --sign-command="$SIGN_COMMAND" fi EXIT_CODE=$?