Skip to content

Commit

Permalink
update 2023-12-21T17:46:29
Browse files Browse the repository at this point in the history
  • Loading branch information
qameta-ci committed Dec 21, 2023
1 parent 8ab90d2 commit 895327a
Show file tree
Hide file tree
Showing 31 changed files with 203 additions and 900 deletions.
33 changes: 16 additions & 17 deletions .github/workflows/allure-report.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
name: Allure Report
run-name: ${{ github.actor }} is creating Allure report 🚀

on:
push:
Expand All @@ -10,41 +11,39 @@ jobs:
name: Run tests and generate Allure Report
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK
uses: actions/setup-java@v3
- name: Clone repository
uses: actions/[email protected]

- name: Set up Java 21
uses: actions/[email protected]
with:
java-version: 8
java-version: 21
cache: 'gradle'
distribution: 'zulu'

- name: Install dependencies
run: ./gradlew compileTestJava

- name: Run Test
if: always()
run: ./gradlew test
continue-on-error: true

- name: Get Allure history
uses: actions/checkout@v3
- name: Setup Allure History
uses: actions/checkout@v4.1.1
if: always()
continue-on-error: true
with:
ref: gh-pages
path: gh-pages

- name: Allure Report action from marketplace
- name: Generate Allure Report
uses: simple-elf/[email protected]
if: always()
with:
allure_results: build/allure-results
allure_history: allure-history

- name: Deploy report to Github Pages
- name: Publish Allure Report
if: always()
uses: peaceiris/actions-gh-pages@v2
env:
PERSONAL_TOKEN: ${{ secrets.GITHUB_TOKEN }}
PUBLISH_BRANCH: gh-pages
PUBLISH_DIR: allure-history
uses: peaceiris/actions-gh-pages@v3.9.3
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_branch: gh-pages
publish_dir: allure-history
29 changes: 0 additions & 29 deletions .github/workflows/testplan.yml

This file was deleted.

28 changes: 19 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,34 @@
#Allure
.allure
/*/allure-results/

#Maven
target

#Gradle
.gradle
schema
build
/*/allure-results/
out
.gradletasknamecache

#IDEA Files
#IDEA
.idea/*
*.iml
*.ipr

#Eclipse files
#Eclipse
*.settings
*.classpath
*.project
*.pydevproject

#Mac OS stuff
.DS_Store
#Netbeans
**/nbproject/private/
**/nbproject/Makefile-*.mk
**/nbproject/Package-*.bash
nbbuild/
dist/
nbdist/
.nb-gradle/

#Netbeans files
/.nb-gradle/
#Mac OS
.DS_Store
16 changes: 13 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# Allure Spock 2 Groovy 4 example
# Allure Example

This project uses Gradle KTS, JUnit Platform and Groovy 4
> Example of Allure Report usage with spock, groovy 4.0 and Gradle (Kotlin)
The generated report available here: https://allure-examples.github.io/allure-spock2-gradle-kts
<!--<img src="https://allurereport.org/public/img/allure-report.svg" alt="Allure Report logo" style="float: right" />-->

- Learn more about Allure Report at https://allurereport.org
- 📚 [Documentation](https://allurereport.org/docs/) – discover official documentation for Allure Report
-[Questions and Support](https://github.com/orgs/allure-framework/discussions/categories/questions-support) – get help from the team and community
- 📢 [Official annoucements](https://github.com/orgs/allure-framework/discussions/categories/announcements) – be in touch with the latest updates
- 💬 [General Discussion ](https://github.com/orgs/allure-framework/discussions/categories/general-discussion) – engage in casual conversations, share insights and ideas with the community

---

The generated report is available here: [https://allure-examples.github.io/spock-groovy-4.0-gradlekts](https://allure-examples.github.io/spock-groovy-4.0-gradlekts/)
38 changes: 25 additions & 13 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,28 @@ plugins {
}

tasks.withType(Wrapper::class) {
gradleVersion = "7.5.1"
gradleVersion = "8.5"
}

group = "io.qameta.allure.examples"
version = 1.3
group = "com.example.spock"
version = "1.0-SNAPSHOT"

val allureVersion = "2.24.0"
val cucumberVersion = "7.13.0"
val aspectJVersion = "1.9.20"
val allureVersion = "2.25.0"
val aspectJVersion = "1.9.21"
val groovyVersion = "4.0.16"
val spockVersion = "2.3-groovy-4.0"

java {
toolchain {
languageVersion.set(JavaLanguageVersion.of(21))
}
}

tasks.withType(JavaCompile::class) {
options.encoding = "UTF-8"
options.compilerArgs.add("-parameters")
}

val agent: Configuration by configurations.creating {
isCanBeConsumed = true
isCanBeResolved = true
Expand All @@ -28,22 +39,23 @@ tasks.test {
}

dependencies {
agent("org.aspectj:aspectjweaver:${aspectJVersion}")

agent("org.aspectj:aspectjweaver:$aspectJVersion")
testImplementation(platform("io.qameta.allure:allure-bom:$allureVersion"))
testImplementation("io.qameta.allure:allure-spock2")
testImplementation("io.qameta.allure:allure-junit-platform")


// it is important to have spock dependencies to be defined after allure-spock2!!!
// see https://github.com/allure-framework/allure-java/issues/928#issuecomment-1594596412
testImplementation(platform("org.spockframework:spock-bom:$spockVersion"))
testImplementation("org.spockframework:spock-core")

testImplementation(platform("org.apache.groovy:groovy-bom:$groovyVersion"))

testImplementation(platform("org.junit:junit-bom:5.10.0"))
testImplementation("org.junit.platform:junit-platform-suite")
testImplementation(platform("org.junit:junit-bom:5.10.1"))
testImplementation("org.junit.jupiter:junit-jupiter-api")
testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine")

testImplementation("org.slf4j:slf4j-simple:1.7.30")
testImplementation("org.slf4j:slf4j-simple:2.0.9")
}

repositories {
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
35 changes: 22 additions & 13 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,13 +80,11 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD=maximum
Expand Down Expand Up @@ -133,22 +131,29 @@ location of your Java installation."
fi
else
JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
if ! command -v java >/dev/null 2>&1
then
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
fi

# Increase the maximum file descriptors if we can.
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC2039,SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -193,11 +198,15 @@ if "$cygwin" || "$msys" ; then
done
fi

# Collect all arguments for the java command;
# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
# shell script including quotes and variable substitutions, so put them in
# double quotes to make sure that they get re-expanded; and
# * put everything else in single quotes, so that it's not re-expanded.

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

# Collect all arguments for the java command:
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
# and any embedded shellness will be escaped.
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
# treated as '${Hostname}' itself on the command line.

set -- \
"-Dorg.gradle.appname=$APP_BASE_NAME" \
Expand Down
Loading

0 comments on commit 895327a

Please sign in to comment.