Skip to content

Commit c9770fe

Browse files
velovelo
committed
Remove SQRL from build matrix
1 parent d4d12ba commit c9770fe

File tree

5 files changed

+69
-29
lines changed

5 files changed

+69
-29
lines changed

‎.github/workflows/deploy.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build uber jar
1+
name: Deploy jars
22

33
on:
44
release:

‎.github/workflows/uber-jar.yml‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020

2121
strategy:
2222
matrix:
23-
SQRL_VERSION: [0.5.10, 0.6.0-SNAPSHOT]
2423
FLINK_PROFILE: [flink-1.19, flink-1.20]
2524

2625
env:
@@ -55,8 +54,8 @@ jobs:
5554
5655
- name: Download dependencies
5756
run: |
58-
mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.8.1:go-offline de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies -P${{ matrix.FLINK_PROFILE }} -Dsqrl.version=${{ matrix.SQRL_VERSION }}
59-
mvn -B -f flink-jar-runner/pom.xml org.apache.maven.plugins:maven-resources-plugin:3.3.1:testResources com.marvinformatics:docker-compose-maven-plugin:5.0.0:pull -P${{ matrix.FLINK_PROFILE }} -Dsqrl.version=${{ matrix.SQRL_VERSION }}
57+
mvn -B org.apache.maven.plugins:maven-dependency-plugin:3.8.1:go-offline de.qaware.maven:go-offline-maven-plugin:1.2.8:resolve-dependencies -P${{ matrix.FLINK_PROFILE }}
58+
mvn -B -f flink-jar-runner/pom.xml org.apache.maven.plugins:maven-resources-plugin:3.3.1:testResources com.marvinformatics:docker-compose-maven-plugin:5.0.0:pull -P${{ matrix.FLINK_PROFILE }}
6059
6160
- name: Update version
6261
if: github.event_name == 'release' && github.event.action == 'created'
@@ -65,7 +64,7 @@ jobs:
6564
6665
- name: Run Maven Build
6766
run: |
68-
mvn -B clean install -P${{ matrix.FLINK_PROFILE }} -Dsqrl.version=${{ matrix.SQRL_VERSION }}
67+
mvn -B clean install -P${{ matrix.FLINK_PROFILE }}
6968
7069
- name: Log in to Docker Hub
7170
uses: docker/login-action@v2
@@ -76,19 +75,19 @@ jobs:
7675
- name: Build Docker image
7776
working-directory: ./flink-jar-runner/target/
7877
run: |
79-
DOCKER_TAG=$DOCKER_REPO:${{ env.VERSION }}-sqrl-${{ matrix.SQRL_VERSION }}-${{ matrix.FLINK_PROFILE }}
80-
docker build --build-arg SQRL_VERSION=${{ matrix.SQRL_VERSION }} --build-arg RUNNER_VERSION=${{ env.VERSION }} -t $DOCKER_TAG .
78+
DOCKER_TAG=$DOCKER_REPO:${{ env.VERSION }}-${{ matrix.FLINK_PROFILE }}
79+
docker build -t $DOCKER_TAG .
8180
docker push $DOCKER_TAG
8281
8382
- name: Rename jar file
8483
if: github.event_name == 'release' && github.event.action == 'created'
8584
run: |
86-
mv target/flink-jar-runner.uber.jar target/flink-jar-runner-${{ env.VERSION }}-sqrl-${{ matrix.SQRL_VERSION }}-${{ matrix.FLINK_PROFILE }}.jar
85+
mv target/flink-jar-runner.uber.jar target/flink-jar-runner-${{ env.VERSION }}-${{ matrix.FLINK_PROFILE }}.jar
8786
8887
- name: Upload to GitHub Release
8988
if: github.event_name == 'release' && github.event.action == 'created'
9089
uses: softprops/action-gh-release@v1
9190
with:
92-
files: target/flink-jar-runner-${{ env.VERSION }}-sqrl-${{ matrix.SQRL_VERSION }}-${{ matrix.FLINK_PROFILE }}.jar
91+
files: target/flink-jar-runner-${{ env.VERSION }}-${{ matrix.FLINK_PROFILE }}.jar
9392
env:
9493
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎flink-jar-runner/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@
237237
<configuration>
238238
<finalName>flink-jar-runner.uber</finalName>
239239
<shadedArtifactAttached>true</shadedArtifactAttached>
240-
<shadedClassifierName>sqrlv${sqrl.version}-flink${flink.version}</shadedClassifierName>
240+
<shadedClassifierName>flink${flink.version}</shadedClassifierName>
241241
<artifactSet>
242242
<excludes>
243243
<exclude>org.apache.flink:flink-shaded-force-shading</exclude>
@@ -409,5 +409,5 @@
409409
</build>
410410

411411
</profile>
412-
</profiles>
412+
</profiles>
413413
</project>

‎pom.xml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,65 @@
340340
<properties>
341341
<gcf.skip>true</gcf.skip>
342342
</properties>
343+
344+
<build>
345+
<plugins>
346+
<plugin>
347+
<groupId>org.apache.maven.plugins</groupId>
348+
<artifactId>maven-gpg-plugin</artifactId>
349+
<version>1.5</version>
350+
<executions>
351+
<execution>
352+
<id>sign-artifacts</id>
353+
<goals>
354+
<goal>sign</goal>
355+
</goals>
356+
<phase>deploy</phase>
357+
</execution>
358+
</executions>
359+
</plugin>
360+
361+
<plugin>
362+
<groupId>org.apache.maven.plugins</groupId>
363+
<artifactId>maven-source-plugin</artifactId>
364+
<version>2.2.1</version>
365+
<executions>
366+
<execution>
367+
<id>attach-sources</id>
368+
<goals>
369+
<goal>jar-no-fork</goal>
370+
</goals>
371+
</execution>
372+
</executions>
373+
</plugin>
374+
<plugin>
375+
<groupId>org.apache.maven.plugins</groupId>
376+
<artifactId>maven-javadoc-plugin</artifactId>
377+
<version>3.6.3</version>
378+
<configuration>
379+
<failOnError>false</failOnError>
380+
</configuration>
381+
<executions>
382+
<execution>
383+
<id>attach-javadocs</id>
384+
<goals>
385+
<goal>jar</goal>
386+
</goals>
387+
<phase>package</phase>
388+
<configuration>
389+
<show>public</show>
390+
<failOnError>false</failOnError>
391+
<detectOfflineLinks>false</detectOfflineLinks>
392+
<doclint>all,-missing</doclint>
393+
<nohelp>true</nohelp>
394+
<excludePackageNames>*.internal.*,testutil,demo</excludePackageNames>
395+
<quiet>true</quiet>
396+
</configuration>
397+
</execution>
398+
</executions>
399+
</plugin>
400+
</plugins>
401+
</build>
343402
</profile>
344403
<profile>
345404
<!-- just compile, skip all other checks -->

‎sqrl-flexible-csv/pom.xml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -71,22 +71,4 @@
7171
<scope>provided</scope>
7272
</dependency>
7373
</dependencies>
74-
<build>
75-
<plugins>
76-
<plugin>
77-
<groupId>org.sonatype.central</groupId>
78-
<artifactId>central-publishing-maven-plugin</artifactId>
79-
<version>0.4.0</version>
80-
<extensions>true</extensions>
81-
<configuration>
82-
<publishingServerId>central</publishingServerId>
83-
<tokenAuth>true</tokenAuth>
84-
</configuration>
85-
</plugin>
86-
<plugin>
87-
<groupId>org.apache.maven.plugins</groupId>
88-
<artifactId>maven-javadoc-plugin</artifactId>
89-
</plugin>
90-
</plugins>
91-
</build>
9274
</project>

0 commit comments

Comments
 (0)