Skip to content

Commit

Permalink
Merge #330
Browse files Browse the repository at this point in the history
330: Fix error in build during `deploy` and add `Artifacts` to Github actions r=alallema a=alallema

Fixing the failed build on the `deploy` stage in Github Actions
Add test result in `Artifacts`

Co-authored-by: alallema <[email protected]>
Co-authored-by: Amélie <[email protected]>
  • Loading branch information
3 people authored Feb 4, 2022
2 parents 83dc975 + cf11553 commit 50ed2c5
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 6 deletions.
13 changes: 11 additions & 2 deletions .github/workflows/ossrh-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,24 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Set up Java
uses: actions/setup-java@v1
uses: actions/setup-java@v2
with:
java-version: 1.8
java-version: 8
distribution: 'zulu'
cache: gradle
- name: Check release validity
run: bash .github/scripts/check-release.sh
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
- name: Archive test report
uses: actions/upload-artifact@v2
if: failure()
with:
name: Test report
path: build/reports/tests/test
if-no-files-found: ignore
- name: Decode secring.gpg
run: |
echo "${{secrets.SIGNING_SECRET_KEY_RING_FILE}}" > ~/.gradle/secring.gpg.b64
Expand Down
15 changes: 12 additions & 3 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,16 +18,25 @@ jobs:
name: integration-and-unit-tests
steps:
- uses: actions/checkout@v2
- name: Set up JDK 1.8
uses: actions/setup-java@v1
- name: Set up Java
uses: actions/setup-java@v2
with:
java-version: 1.8
java-version: 8
distribution: 'zulu'
cache: gradle
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Meilisearch (latest version) setup with Docker
run: docker run -d -p 7700:7700 getmeili/meilisearch:latest ./meilisearch --no-analytics=true --master-key='masterKey'
- name: Build and run unit and integration tests
run: ./gradlew build integrationTest
- name: Archive test report
uses: actions/upload-artifact@v2
if: failure()
with:
name: Test report
path: build/reports/tests/integrationTest
if-no-files-found: ignore

linter:
runs-on: ubuntu-latest
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/com/meilisearch/integration/KeysTest.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.junit.jupiter.api.Tag;
import org.junit.jupiter.api.Test;

@Tag("integrationKey")
@Tag("integration")
public class KeysTest extends AbstractIT {

@BeforeEach
Expand Down

0 comments on commit 50ed2c5

Please sign in to comment.