Skip to content

Commit

Permalink
Revert "update artifact actions (#1067)"
Browse files Browse the repository at this point in the history
Due to actions/download-artifact#249

This reverts commit 780492c.
  • Loading branch information
nyurik committed Dec 16, 2023
1 parent b77bc89 commit 15a521d
Showing 1 changed file with 15 additions and 15 deletions.
30 changes: 15 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ jobs:
done
- name: Save build artifacts to build-${{ matrix.target }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: cross-build
path: target_releases/*
Expand Down Expand Up @@ -282,7 +282,7 @@ jobs:
mv target/${{ matrix.target }}/release/martin-cp${{ matrix.ext }} target_releases/
mv target/${{ matrix.target }}/release/mbtiles${{ matrix.ext }} target_releases/
- name: Save build artifacts to build-${{ matrix.target }}
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: build-${{ matrix.target }}
path: target_releases/*
Expand Down Expand Up @@ -324,7 +324,7 @@ jobs:
env:
DATABASE_URL: ${{ steps.pg.outputs.connection-uri }}
- name: Download build artifact build-${{ matrix.target }}
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-${{ matrix.target }}
path: target/
Expand All @@ -345,7 +345,7 @@ jobs:
run: diff --brief --recursive --new-file tests/output tests/expected
- name: Download Debian package (Linux)
if: matrix.target == 'x86_64-unknown-linux-gnu'
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-debian-x86_64
path: target/
Expand All @@ -362,7 +362,7 @@ jobs:
DATABASE_URL: ${{ steps.pg.outputs.connection-uri }}
- name: Save test output on failure
if: failure()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: failed-test-output-${{ runner.os }}
path: |
Expand Down Expand Up @@ -439,7 +439,7 @@ jobs:
docker cp ${{ job.services.postgres.id }}:/etc/ssl/certs/ssl-cert-snakeoil.pem target/certs/server.crt
docker cp ${{ job.services.postgres.id }}:/etc/ssl/private/ssl-cert-snakeoil.key target/certs/server.key
- name: Download build artifact build-x86_64-unknown-linux-gnu
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-x86_64-unknown-linux-gnu
path: target_releases/
Expand All @@ -458,7 +458,7 @@ jobs:
env:
DATABASE_URL: postgres://${{ env.PGUSER }}:${{ env.PGUSER }}@${{ env.PGHOST }}:${{ job.services.postgres.ports[5432] }}/${{ env.PGDATABASE }}?sslmode=${{ matrix.sslmode }}
- name: Download Debian package
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-debian-x86_64
path: target_releases/
Expand Down Expand Up @@ -490,7 +490,7 @@ jobs:
DATABASE_URL: postgres://${{ env.PGUSER }}:${{ env.PGUSER }}@${{ env.PGHOST }}:${{ job.services.postgres.ports[5432] }}/${{ env.PGDATABASE }}?sslmode=${{ matrix.sslmode }}
- name: On error, save test output
if: failure()
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: test-output
path: |
Expand All @@ -506,34 +506,34 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v4
- name: Download build artifact build-aarch64-apple-darwin
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-aarch64-apple-darwin
path: target/aarch64-apple-darwin
- name: Download build artifact build-x86_64-apple-darwin
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-x86_64-apple-darwin
path: target/x86_64-apple-darwin
- name: Download build artifact build-x86_64-unknown-linux-gnu
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-x86_64-unknown-linux-gnu
path: target/x86_64-unknown-linux-gnu

- name: Download cross-build artifacts
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: cross-build
path: target/cross

- name: Download build artifact build-x86_64-pc-windows-msvc
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-x86_64-pc-windows-msvc
path: target/x86_64-pc-windows-msvc
- name: Download build artifact build-debian-x86_64
uses: actions/download-artifact@v4
uses: actions/download-artifact@v3
with:
name: build-debian-x86_64
path: target/debian-x86_64
Expand Down Expand Up @@ -604,7 +604,7 @@ jobs:
EOF
- name: Save Homebrew Config
uses: actions/upload-artifact@v4
uses: actions/upload-artifact@v3
with:
name: homebrew-config
path: target/homebrew_config.yaml
Expand Down

0 comments on commit 15a521d

Please sign in to comment.