Skip to content

Commit

Permalink
Merge main into ATL-2994
Browse files Browse the repository at this point in the history
  • Loading branch information
cristianIOHK committed Jan 19, 2023
2 parents cd4c8bc + 2fc68db commit 92544cd
Show file tree
Hide file tree
Showing 40 changed files with 235 additions and 622 deletions.
114 changes: 114 additions & 0 deletions .github/workflows/pull-request.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
name: Pull Request CI

defaults:
run:
shell: bash

concurrency:
group: ${{ github.head_ref }}${{ github.ref }}
cancel-in-progress: true

env:
JAVA_VERSION: 11
NODEJS_VERSION: 16.17.0
ATALA_GITHUB_ACTOR: ${{ secrets.ATALA_GITHUB_ACTOR }}
ATALA_GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}

on:
pull_request:
branches: [main]

jobs:

lint:
name: Lint changes
runs-on: ubuntu-latest
env:
APPLY_FIXES: all
APPLY_FIXES_EVENT: pull_request
APPLY_FIXES_MODE: commit
VALIDATE_ALL_CODEBASE: ${{ github.ref_name == 'main' }}
DISABLE: COPYPASTE,SPELL
GITHUB_TOKEN: ${{ secrets.ATALA_GITHUB_TOKEN }}
steps:
- name: Checkout Code
uses: actions/checkout@v3
with:
token: ${{ secrets.ATALA_GITHUB_TOKEN }}
fetch-depth: 0
- name: Mega-Linter
id: ml
uses: megalinter/megalinter@v6
- name: Archive production artifacts
if: success() || failure()
uses: actions/upload-artifact@v3
with:
name: Mega-Linter reports
path: |
report
mega-linter.log
build:
strategy:
matrix:
include:
- os: ubuntu-latest
os-type: linux
# - os: windows-latest
# os-type: windows
fail-fast: false
runs-on: ${{ matrix.os }}

steps:
- name: Checkout the repo
uses: actions/checkout@v3

- name: Validate Gradle Wrapper
uses: gradle/wrapper-validation-action@v1

- name: Cache gradle
uses: actions/cache@v3
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
~/.konan
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*') }}
restore-keys: |
${{ runner.os }}-gradle-
- name: Install Java ${{ env.JAVA_VERSION }}
uses: actions/setup-java@v3
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: 'zulu'

- name: Install NodeJS ${{ env.NODEJS_VERSION }}
if: matrix.os-type == 'linux'
uses: actions/setup-node@v3
with:
node-version: ${{ env.NODEJS_VERSION }}

# TODO: This is disable for now it needs to be checked a linting error
# - name: Test Kotlin code is properly formatted
# run: ./gradlew ktlintCheck

# - name: Build for iOS, macOS, tvOS, watchOS
# if: matrix.os-type == 'macos'
# run: |
# ./gradlew clean build iosX64Test --stacktrace
# # removed watchosX64Test as GitHub action gets Invalid device: Apple Watch Series 5 - 44mm
# # no longer supporting them => macosX64Test tvosX64Test
# # TODO: This is not needed now

- name: Build for JS, Android, JVM
if: matrix.os-type == 'linux'
run: |
./gradlew build allTests --stacktrace
- name: Upload the build report
if: always()
uses: actions/upload-artifact@v3
with:
path: "**/build/reports/"
name: report-${{ matrix.os-type }}
147 changes: 0 additions & 147 deletions authenticate-sdk/build.gradle.kts

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions authenticate-sdk/src/jsMain/kotlin/JSExport.kt

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

16 changes: 6 additions & 10 deletions build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,23 +1,13 @@
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootExtension
import org.jetbrains.kotlin.gradle.targets.js.nodejs.NodeJsRootPlugin

version = "1.0.0-alpha"
group = "io.iohk.atala.prism"

plugins {
java
kotlin("jvm") version "1.7.20"
kotlin("plugin.serialization") version "1.7.20"
id("maven-publish")
id("org.jlleitschuh.gradle.ktlint") version "11.0.0"
id("org.jetbrains.dokka") version "1.7.10"
//id("com.google.protobuf") version "0.9.2"
// The following should be removed
// id(Plugins.npmPublish) version PluginVersions.npmPublish apply false
// id(Plugins.gitVersion) version PluginVersions.gitVersion
// id(Plugins.compatibilityValidator) version PluginVersions.compatibilityValidator
// id(Plugins.gitOps) version PluginVersions.gitOps
// id(Plugins.koverage) version PluginVersions.koverage
}

buildscript {
Expand Down Expand Up @@ -47,7 +37,13 @@ java {
}
}

version = "1.0.0-alpha"
group = "io.iohk.atala.prism"

allprojects {
this.group = group
this.version = version

repositories {
mavenCentral()
mavenLocal()
Expand Down
Loading

0 comments on commit 92544cd

Please sign in to comment.