From c88d9c22441d6acb50b850bec8c0f55ebf0ac6b4 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Thu, 21 Dec 2023 19:04:51 -0500 Subject: [PATCH] cleanup ci --- .github/workflows/ci.yml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5076c8495..1a770564e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -63,7 +63,7 @@ jobs: - run: cargo clippy --package martin --features bless-tests -- -D warnings - run: cargo doc --no-deps --workspace env: - RUSTDOCFLAGS: "-D warnings" + RUSTDOCFLAGS: '-D warnings' - name: Init database run: tests/fixtures/initdb.sh env: @@ -108,6 +108,7 @@ jobs: --entrypoint sh postgis/postgis:15-3.3 -c "exec docker-entrypoint.sh postgres -c ssl=on -c ssl_cert_file=/etc/ssl/certs/ssl-cert-snakeoil.pem -c ssl_key_file=/etc/ssl/private/ssl-cert-snakeoil.key" + steps: - uses: taiki-e/install-action@v2 with: @@ -535,7 +536,7 @@ jobs: - name: Package run: | set -x - + cd target mkdir files mv cross/* . @@ -544,34 +545,34 @@ jobs: chmod +x martin martin-cp mbtiles tar czvf ../files/martin-aarch64-apple-darwin.tar.gz martin martin-cp mbtiles cd .. - + cd x86_64-apple-darwin chmod +x martin martin-cp mbtiles tar czvf ../files/martin-x86_64-apple-darwin.tar.gz martin martin-cp mbtiles cd .. - + cd x86_64-unknown-linux-gnu chmod +x martin martin-cp mbtiles tar czvf ../files/martin-x86_64-unknown-linux-gnu.tar.gz martin martin-cp mbtiles cd .. - + cd aarch64-unknown-linux-musl chmod +x martin martin-cp mbtiles tar czvf ../files/martin-aarch64-unknown-linux-musl.tar.gz martin martin-cp mbtiles cd .. - + cd x86_64-unknown-linux-musl chmod +x martin martin-cp mbtiles tar czvf ../files/martin-x86_64-unknown-linux-musl.tar.gz martin martin-cp mbtiles cd .. - + # # Special case for Windows # cd x86_64-pc-windows-msvc 7z a ../files/martin-x86_64-pc-windows-msvc.zip martin.exe martin-cp.exe mbtiles.exe cd .. - + # # Special case for Debian .deb package # @@ -585,10 +586,10 @@ jobs: # Extract Github release version only without the "v" prefix MARTIN_VERSION=$(echo "${{ github.ref }}" | sed -e 's/refs\/tags\/v//') - + mkdir -p target/homebrew cd target - + cat << EOF > homebrew_config.yaml version: "$MARTIN_VERSION" macos_arm_sha256: "$(shasum -a 256 files/martin-aarch64-apple-darwin.tar.gz | cut -d' ' -f1)" @@ -643,14 +644,14 @@ jobs: # Access Metadata: Read-only # Access Pull requests: Read and write token: ${{ secrets.GH_HOMEBREW_MARTIN_TOKEN }} - commit-message: "Update to ${{ github.ref }}" - title: "Update to ${{ github.ref }}" - body: "Update to ${{ github.ref }}" - branch: "update-to-${{ github.ref }}" + commit-message: 'Update to ${{ github.ref }}' + title: 'Update to ${{ github.ref }}' + body: 'Update to ${{ github.ref }}' + branch: 'update-to-${{ github.ref }}' branch-suffix: timestamp - base: "main" - labels: "auto-update" - assignees: "nyurik" + base: 'main' + labels: 'auto-update' + assignees: 'nyurik' draft: false delete-branch: true path: target/homebrew