Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Integrate Custom Random Matrix Generation and Merge Ubuntu and Windows Workflows #1776

Merged
merged 21 commits into from
Jun 16, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
5a6b185
###feature/Integrate random matrix generation and merge Ubuntu and Wi…
BereKanters Jun 11, 2024
076c136
###feature/Added feature-random-matrix-ci.patch file
BereKanters Jun 12, 2024
eed59ef
chore(deps): update codecov/codecov-action action to v4.5.0
renovate[bot] Jun 13, 2024
838adff
chore(deps): update gradle/gradle-build-action action to v3.4.0
renovate[bot] Jun 13, 2024
2f35e51
###feat/Integrate custom random matrix generation and merge Ubuntu an…
BereKanters Jun 14, 2024
0ed037d
###feat/Changed custom random matrix generation and merge Ubuntu and …
BereKanters Jun 14, 2024
011c353
chore(deps): update gradle/gradle-build-action action to v3.4.1
renovate[bot] Jun 15, 2024
28ff511
###feat/Updated custom random matrix generation
BereKanters Jun 15, 2024
cbdb137
Samples for CharSequence to contain in api infix 1543 (#1774)
BereKanters Jun 16, 2024
54bcb65
###feature/Integrate random matrix generation and merge Ubuntu and Wi…
BereKanters Jun 11, 2024
8534729
###feature/Added feature-random-matrix-ci.patch file
BereKanters Jun 12, 2024
1c6ae48
###feat/Integrate custom random matrix generation and merge Ubuntu an…
BereKanters Jun 14, 2024
3aa9bc4
- Updated the `forwardCompatibility` job to run in parallel with `dex…
BereKanters Jun 14, 2024
0f3bb2c
###feat/Updated custom random matrix generation
BereKanters Jun 15, 2024
0bedc23
###fix/Add feature extractors and test samples for SQLException
BereKanters Jun 16, 2024
9cb8e0e
Merge remote-tracking branch 'origin/feature/random-matrix-ci' into f…
BereKanters Jun 16, 2024
657d32d
###fix/Reset to earlier commit
BereKanters Jun 16, 2024
3cc3868
Merge remote-tracking branch 'origin/feature/random-matrix-ci' into f…
BereKanters Jun 16, 2024
7715148
###fix/Update matrix generation with proper name pattern
BereKanters Jun 16, 2024
ef22258
###fix/Updated matrix generation with axis for Distribtuion
BereKanters Jun 16, 2024
0fbadea
###fix/Updated matrix generation Axis name to right one
BereKanters Jun 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
115 changes: 115 additions & 0 deletions .github/workflows/ci.yml
robstoll marked this conversation as resolved.
Show resolved Hide resolved
robstoll marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
name: CI

on: [ push, pull_request ]

jobs:
# Job to generate the matrix
generate-matrix:
runs-on: ubuntu-latest
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- name: Checkout
uses: actions/checkout@v4
robstoll marked this conversation as resolved.
Show resolved Hide resolved

- name: Generate matrix
id: set-matrix
uses: vlsi/github-actions-random-matrix@v1
robstoll marked this conversation as resolved.
Show resolved Hide resolved
with:
include: |
[
{"os": "ubuntu-latest", "java_version": "11"},
{"os": "ubuntu-latest", "java_version": "17"},
{"os": "windows-latest", "java_version": "11"},
{"os": "windows-latest", "java_version": "17"}
]

# Setup job to run common steps
setup:
robstoll marked this conversation as resolved.
Show resolved Hide resolved
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Cache Android jar
id: android-cache
uses: actions/cache@v4
with:
path: android-jar-cache
key: ${{ runner.os }}-android-version-26

- name: Download Android SDK's android.jar (or use cached file)
if: steps.android-cache.outputs.cache-hit != 'true'
run: |
mkdir android-jar-cache
cd android-jar-cache
curl -o android.jar -L "https://github.com/Sable/android-platforms/blob/master/android-26/android.jar?raw=true"
echo "cdc1846376a14b0370cc63454a129606b4a52cc50ada75ef0d4cf956b1ad2daa android.jar" > android.sha256
if ! sha256sum -c android.sha256; then
echo >&2 "wrong sha256 for android.jar, expected:"
cat >&2 android.sha256
echo >&2 "actual:"
sha256sum android.jar
exit 1;
fi

# Main build and test job using the generated matrix
build-and-test:
needs: [generate-matrix, setup]
robstoll marked this conversation as resolved.
Show resolved Hide resolved
runs-on: ${{ matrix.os }}
strategy:
matrix: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Set up JDK ${{ matrix.java_version }}
uses: actions/setup-java@v4
with:
distribution: 'adopt'
robstoll marked this conversation as resolved.
Show resolved Hide resolved
java-version: ${{ matrix.java_version }}

- name: Setup Gradle
uses: gradle/[email protected]

- name: Build using JDK ${{ matrix.java_version }}
run: ./gradlew build

- name: Upload build code coverage
uses: codecov/[email protected]
if: ${{ github.event_name == 'pull_request' || (github.event_name == 'push' && github.ref == 'refs/heads/main') }}
with:
token: ${{ secrets.CODECOV_TOKEN }}
flags: ${{ matrix.os == 'windows-latest' && 'current_windows' || 'current' }}
env_vars: JAVA_VERSION

- name: Check Atrium's -jvm.jar can be dexed
run: ATRIUM_ANDROID_JAR="$PWD/android-jar-cache/android.jar" ./gradlew checkDexer

- name: Composite build atrium-samples-test
run: ./gradlew build
working-directory: misc/tools/atrium-samples-test

forwardCompatibility:
needs: setup
env:
JAVA_VERSION: 17
KOTLIN_VERSION: ${{ matrix.kotlin_version }}
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
kotlin_version: [ '1.5', '1.6', '1.7', '1.8', '1.9', '2.0' ]
steps:
- uses: actions/checkout@v4
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
distribution: 'adopt'
java-version: 17

- name: Setup Gradle
uses: gradle/[email protected]

- name: Build using Kotlin ${{ matrix.kotlin_version }}
run: ./gradlew build
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@
[![Download](https://img.shields.io/badge/Download-1.2.0-%23007ec6)](https://central.sonatype.com/artifact/ch.tutteli.atrium/atrium-fluent/1.2.0)
[![EUPL](https://img.shields.io/badge/%E2%9A%96-EUPL%201.2-%230b45a6)](https://joinup.ec.europa.eu/collection/eupl/eupl-text-11-12 "License")
[![atrium @ kotlinlang.slack.com](https://img.shields.io/static/v1?label=kotlinlang&message=atrium&color=blue&logo=slack)](https://kotlinlang.slack.com/messages/atrium "See invitation link under section FAQ")
[![Build Status Ubuntu](https://github.com/robstoll/atrium/workflows/Ubuntu/badge.svg?event=push&branch=main)](https://github.com/robstoll/atrium/actions?query=workflow%3AUbuntu+branch%3Amain)
[![Build Status Windows](https://github.com/robstoll/atrium/workflows/Windows/badge.svg?event=push&branch=main)](https://github.com/robstoll/atrium/actions?query=workflow%3AWindows+branch%3Amain)
[![Build Status](https://github.com/robstoll/atrium/actions/workflows/ci.yml/badge.svg?event=push&branch=main)](https://github.com/robstoll/atrium/actions?query=workflow%3Aci.yml+branch%3Amain)
robstoll marked this conversation as resolved.
Show resolved Hide resolved
[![Coverage](https://codecov.io/gh/robstoll/atrium/branch/main/graph/badge.svg)](https://app.codecov.io/github/robstoll/atrium/branch/main)
[![Newcomers Welcome](https://img.shields.io/badge/%F0%9F%91%8B-Newcomers%20Welcome-blueviolet)](https://github.com/robstoll/atrium/issues?q=is%3Aissue+is%3Aopen+label%3A%22good+first+issue%22 "Ask in slack for help")

Expand Down
Binary file added feature-random-matrix-ci.patch
robstoll marked this conversation as resolved.
Show resolved Hide resolved
robstoll marked this conversation as resolved.
Show resolved Hide resolved
Binary file not shown.
Loading