Skip to content
This repository was archived by the owner on May 7, 2025. It is now read-only.

Commit 7df0fe2

Browse files
mladjan-gadzicmladjan-gadzic
authored
fix-ci (#4)
* create maven profiles, use ci profile for release, include getting and creating proto files for local profile only
1 parent fb8ce51 commit 7df0fe2

File tree

2 files changed

+148
-122
lines changed

2 files changed

+148
-122
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
run: |
2929
cp settings.xml /home/runner/.m2
3030
cat /home/runner/.m2/settings.xml
31-
mvn clean install -DskipTests
31+
mvn clean install
3232
env:
3333
MAVEN_GPG_PASSPHRASE: ${{ secrets.GPG_PASSPHRASE }}
3434

@@ -37,7 +37,7 @@ jobs:
3737
pwd
3838
ls -la /home/runner/.m2
3939
cat /home/runner/.m2/settings.xml
40-
mvn --batch-mode deploy -DskipTests
40+
mvn --batch-mode deploy -DskipTests -Pci
4141
env:
4242
MAVEN_USERNAME: ${{ secrets.OSSRH_USERNAME }}
4343
MAVEN_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}

‎pom.xml‎

Lines changed: 146 additions & 120 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@
4646

4747
<scm>
4848
<connection>scm:git:git://github.com/armadaproject/java-client.git</connection>
49-
<developerConnection>scm:git:ssh://github.com:armadaproject/java-client.git</developerConnection>
49+
<developerConnection>scm:git:ssh://github.com:armadaproject/java-client.git
50+
</developerConnection>
5051
<url>http://github.com/armadaproject/java-client/tree/main</url>
5152
<tag/>
5253
</scm>
@@ -58,6 +59,150 @@
5859
</repository>
5960
</distributionManagement>
6061

62+
<profiles>
63+
<profile>
64+
<id>local</id>
65+
<properties>
66+
<env>local</env>
67+
</properties>
68+
<activation>
69+
<activeByDefault>true</activeByDefault>
70+
</activation>
71+
<build>
72+
<plugins>
73+
<!-- get proto files -->
74+
<plugin>
75+
<groupId>org.codehaus.mojo</groupId>
76+
<artifactId>exec-maven-plugin</artifactId>
77+
<version>${exec-maven-plugin.version}</version>
78+
<executions>
79+
<execution>
80+
<id>clone-armada-repo</id>
81+
<phase>generate-sources</phase>
82+
<goals>
83+
<goal>exec</goal>
84+
</goals>
85+
<configuration>
86+
<executable>git</executable>
87+
<arguments>
88+
<argument>clone</argument>
89+
<argument>https://github.com/armadaproject/armada.git</argument>
90+
<argument>${project.build.directory}/armada</argument>
91+
</arguments>
92+
</configuration>
93+
</execution>
94+
<execution>
95+
<id>clone-api-repo</id>
96+
<phase>generate-sources</phase>
97+
<goals>
98+
<goal>exec</goal>
99+
</goals>
100+
<configuration>
101+
<executable>git</executable>
102+
<arguments>
103+
<argument>clone</argument>
104+
<argument>https://github.com/kubernetes/api.git</argument>
105+
<argument>${project.build.directory}/k8s.io/api</argument>
106+
</arguments>
107+
</configuration>
108+
</execution>
109+
<execution>
110+
<id>clone-apimachinery-repo</id>
111+
<phase>generate-sources</phase>
112+
<goals>
113+
<goal>exec</goal>
114+
</goals>
115+
<configuration>
116+
<executable>git</executable>
117+
<arguments>
118+
<argument>clone</argument>
119+
<argument>https://github.com/kubernetes/apimachinery.git</argument>
120+
<argument>${project.build.directory}/k8s.io/apimachinery</argument>
121+
</arguments>
122+
</configuration>
123+
</execution>
124+
</executions>
125+
</plugin>
126+
127+
<!-- copy proto files -->
128+
<plugin>
129+
<artifactId>maven-resources-plugin</artifactId>
130+
<version>${maven-resources-plugin.version}</version>
131+
<executions>
132+
<execution>
133+
<id>copy-protos</id>
134+
<phase>generate-sources</phase>
135+
<goals>
136+
<goal>copy-resources</goal>
137+
</goals>
138+
<configuration>
139+
<outputDirectory>${project.basedir}/src/main/proto</outputDirectory>
140+
<resources>
141+
<resource>
142+
<directory>${project.build.directory}/armada</directory>
143+
<includes>
144+
<include>pkg/api/*.proto</include>
145+
<include>pkg/api/binoculars/*.proto</include>
146+
</includes>
147+
</resource>
148+
<resource>
149+
<directory>${project.build.directory}</directory>
150+
<includes>
151+
<include>k8s.io/api/core/v1/generated.proto</include>
152+
<include>k8s.io/api/networking/v1/generated.proto</include>
153+
<include>k8s.io/apimachinery/pkg/api/resource/generated.proto</include>
154+
<include>k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto</include>
155+
<include>k8s.io/apimachinery/pkg/runtime/generated.proto</include>
156+
<include>k8s.io/apimachinery/pkg/runtime/schema/generated.proto</include>
157+
<include>k8s.io/apimachinery/pkg/util/intstr/generated.proto</include>
158+
</includes>
159+
</resource>
160+
</resources>
161+
</configuration>
162+
</execution>
163+
</executions>
164+
</plugin>
165+
</plugins>
166+
</build>
167+
</profile>
168+
169+
<profile>
170+
<id>ci</id>
171+
<properties>
172+
<env>ci</env>
173+
</properties>
174+
<build>
175+
<plugins>
176+
<plugin>
177+
<groupId>org.sonatype.central</groupId>
178+
<artifactId>central-publishing-maven-plugin</artifactId>
179+
<version>0.6.0</version>
180+
<extensions>true</extensions>
181+
<configuration>
182+
<publishingServerId>central</publishingServerId>
183+
<autoPublish>true</autoPublish>
184+
</configuration>
185+
</plugin>
186+
187+
<plugin>
188+
<groupId>org.apache.maven.plugins</groupId>
189+
<artifactId>maven-gpg-plugin</artifactId>
190+
<version>3.2.7</version>
191+
<executions>
192+
<execution>
193+
<id>sign-artifacts</id>
194+
<phase>verify</phase>
195+
<goals>
196+
<goal>sign</goal>
197+
</goals>
198+
</execution>
199+
</executions>
200+
</plugin>
201+
</plugins>
202+
</build>
203+
</profile>
204+
</profiles>
205+
61206
<build>
62207
<plugins>
63208
<!-- detect os -->
@@ -74,99 +219,6 @@
74219
</executions>
75220
</plugin>
76221

77-
<!-- get proto files -->
78-
<plugin>
79-
<groupId>org.codehaus.mojo</groupId>
80-
<artifactId>exec-maven-plugin</artifactId>
81-
<version>${exec-maven-plugin.version}</version>
82-
<executions>
83-
<execution>
84-
<id>clone-armada-repo</id>
85-
<phase>generate-sources</phase>
86-
<goals>
87-
<goal>exec</goal>
88-
</goals>
89-
<configuration>
90-
<executable>git</executable>
91-
<arguments>
92-
<argument>clone</argument>
93-
<argument>https://github.com/armadaproject/armada.git</argument>
94-
<argument>${project.build.directory}/armada</argument>
95-
</arguments>
96-
</configuration>
97-
</execution>
98-
<execution>
99-
<id>clone-api-repo</id>
100-
<phase>generate-sources</phase>
101-
<goals>
102-
<goal>exec</goal>
103-
</goals>
104-
<configuration>
105-
<executable>git</executable>
106-
<arguments>
107-
<argument>clone</argument>
108-
<argument>https://github.com/kubernetes/api.git</argument>
109-
<argument>${project.build.directory}/k8s.io/api</argument>
110-
</arguments>
111-
</configuration>
112-
</execution>
113-
<execution>
114-
<id>clone-apimachinery-repo</id>
115-
<phase>generate-sources</phase>
116-
<goals>
117-
<goal>exec</goal>
118-
</goals>
119-
<configuration>
120-
<executable>git</executable>
121-
<arguments>
122-
<argument>clone</argument>
123-
<argument>https://github.com/kubernetes/apimachinery.git</argument>
124-
<argument>${project.build.directory}/k8s.io/apimachinery</argument>
125-
</arguments>
126-
</configuration>
127-
</execution>
128-
</executions>
129-
</plugin>
130-
131-
<!-- copy proto files -->
132-
<plugin>
133-
<artifactId>maven-resources-plugin</artifactId>
134-
<version>${maven-resources-plugin.version}</version>
135-
<executions>
136-
<execution>
137-
<id>copy-protos</id>
138-
<phase>generate-sources</phase>
139-
<goals>
140-
<goal>copy-resources</goal>
141-
</goals>
142-
<configuration>
143-
<outputDirectory>${project.basedir}/src/main/proto</outputDirectory>
144-
<resources>
145-
<resource>
146-
<directory>${project.build.directory}/armada</directory>
147-
<includes>
148-
<include>pkg/api/*.proto</include>
149-
<include>pkg/api/binoculars/*.proto</include>
150-
</includes>
151-
</resource>
152-
<resource>
153-
<directory>${project.build.directory}</directory>
154-
<includes>
155-
<include>k8s.io/api/core/v1/generated.proto</include>
156-
<include>k8s.io/api/networking/v1/generated.proto</include>
157-
<include>k8s.io/apimachinery/pkg/api/resource/generated.proto</include>
158-
<include>k8s.io/apimachinery/pkg/apis/meta/v1/generated.proto</include>
159-
<include>k8s.io/apimachinery/pkg/runtime/generated.proto</include>
160-
<include>k8s.io/apimachinery/pkg/runtime/schema/generated.proto</include>
161-
<include>k8s.io/apimachinery/pkg/util/intstr/generated.proto</include>
162-
</includes>
163-
</resource>
164-
</resources>
165-
</configuration>
166-
</execution>
167-
</executions>
168-
</plugin>
169-
170222
<!-- compile java -->
171223
<plugin>
172224
<groupId>org.apache.maven.plugins</groupId>
@@ -231,32 +283,6 @@
231283
</execution>
232284
</executions>
233285
</plugin>
234-
235-
<plugin>
236-
<groupId>org.sonatype.central</groupId>
237-
<artifactId>central-publishing-maven-plugin</artifactId>
238-
<version>0.6.0</version>
239-
<extensions>true</extensions>
240-
<configuration>
241-
<publishingServerId>central</publishingServerId>
242-
<autoPublish>true</autoPublish>
243-
</configuration>
244-
</plugin>
245-
246-
<plugin>
247-
<groupId>org.apache.maven.plugins</groupId>
248-
<artifactId>maven-gpg-plugin</artifactId>
249-
<version>3.2.7</version>
250-
<executions>
251-
<execution>
252-
<id>sign-artifacts</id>
253-
<phase>verify</phase>
254-
<goals>
255-
<goal>sign</goal>
256-
</goals>
257-
</execution>
258-
</executions>
259-
</plugin>
260286
</plugins>
261287
</build>
262288

0 commit comments

Comments
 (0)