Skip to content

Commit 2effe53

Browse files
authored
feat(action): SSH action proxy jump (#219)
1 parent 42bc2bc commit 2effe53

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+1087
-814
lines changed

.github/workflows/build-all-template.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
shell: bash
112112
run: |
113113
mvn org.apache.maven.plugins:maven-install-plugin:3.1.1:install-file \
114-
-Dfile=./chutney/packaging/local-api-unsecure/target/chutney-local-api-unsecure-${{steps.get-version.outputs.PROJECT_VERSION}}.jar \
114+
-Dfile=./chutney/packaging/local-api-unsecure/target/local-api-unsecure-${{steps.get-version.outputs.PROJECT_VERSION}}.jar \
115115
-DgroupId=com.chutneytesting \
116116
-DartifactId=local-api-unsecure \
117117
-Dversion=${{steps.get-version.outputs.PROJECT_VERSION}} \

.github/workflows/release-to-github.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
skipTests: true
1616
cache-artifacts: |
17-
chutney/packaging/local-dev/target/chutney-local-dev-*.jar
17+
chutney/packaging/local-dev/target/local-dev-*.jar
1818
idea-plugin/build/distributions/*.zip
1919
chutney/ui/dist
2020

.github/workflows/release-to-ossrh.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
with:
1515
skipTests: true
1616
cache-artifacts: |
17-
chutney/packaging/local-dev/target/chutney-local-dev-*.jar
17+
chutney/packaging/local-dev/target/local-dev-*.jar
1818
idea-plugin/build/distributions/*.zip
1919
chutney/ui/dist
2020

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
######################
55
# Maven
66
######################
7-
.mvn/*
7+
**/.mvn/*
88
!.mvn/
99
.mvn/wrapper/*
1010
!.mvn/wrapper/

acceptance-tests/pom.xml

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
~
77
-->
88
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9-
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
9+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
1010
<modelVersion>4.0.0</modelVersion>
1111

1212
<parent>
@@ -31,7 +31,6 @@
3131
<kotlin.compiler.apiVersion>1.9</kotlin.compiler.apiVersion>
3232
<kotlin.compiler.jvmTarget>${maven.compiler.target}</kotlin.compiler.jvmTarget>
3333
<kotlin.version>1.9.25</kotlin.version>
34-
3534
</properties>
3635

3736
<dependencyManagement>
@@ -67,6 +66,13 @@
6766
<groupId>com.chutneytesting</groupId>
6867
<artifactId>chutney-kotlin-dsl</artifactId>
6968
</dependency>
69+
70+
<dependency> <!-- Here to be sure that oci image is built before testing -->
71+
<groupId>com.chutneytesting</groupId>
72+
<artifactId>local-dev</artifactId>
73+
<version>${chutney.version}</version>
74+
<scope>test</scope>
75+
</dependency>
7076
<dependency>
7177
<groupId>org.testcontainers</groupId>
7278
<artifactId>testcontainers</artifactId>
@@ -116,16 +122,28 @@
116122
<plugin>
117123
<groupId>org.apache.maven.plugins</groupId>
118124
<artifactId>maven-surefire-plugin</artifactId>
125+
<configuration>
126+
<skip>true</skip>
127+
</configuration>
128+
</plugin>
129+
<plugin>
130+
<groupId>org.apache.maven.plugins</groupId>
131+
<artifactId>maven-failsafe-plugin</artifactId>
132+
<configuration>
133+
<includes>
134+
<include>AcceptanceTests.java</include>
135+
</includes>
136+
</configuration>
119137
</plugin>
120138
<plugin>
121-
<!-- Has to be after the default-test surefire execution declaration -->
139+
<!-- Has to be after the failsafe execution declaration -->
122140
<groupId>org.codehaus.mojo</groupId>
123141
<artifactId>exec-maven-plugin</artifactId>
124142
<version>3.2.0</version>
125143
<executions>
126144
<execution>
127145
<id>chutney-test-report</id>
128-
<phase>test</phase>
146+
<phase>integration-test</phase>
129147
<goals>
130148
<goal>java</goal>
131149
</goals>

0 commit comments

Comments
 (0)