Skip to content

Commit 588e7d8

Browse files
rmichelarmichela
authored
Merge pull request #154 from salesforce/feature/canteen-arm64
Feature/canteen arm64
2 parents fa8939e + 4ca441c commit 588e7d8

File tree

4 files changed

+86
-9
lines changed

4 files changed

+86
-9
lines changed

‎canteen/canteen-bootstrap/pom.xml

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,27 @@
5050
</environmentVariables>
5151
</configuration>
5252
</execution>
53+
<execution>
54+
<id>osx-aarch_64</id>
55+
<goals>
56+
<goal>exec</goal>
57+
</goals>
58+
<phase>compile</phase>
59+
<configuration>
60+
<workingDirectory>${project.basedir}/src/main/go</workingDirectory>
61+
<executable>go</executable>
62+
<arguments>
63+
<argument>build</argument>
64+
<argument>-o</argument>
65+
<argument>${project.build.directory}/${binary.name}-${project.version}-osx-aarch_64.exe</argument>
66+
<argument>.</argument>
67+
</arguments>
68+
<environmentVariables>
69+
<GOOS>darwin</GOOS>
70+
<GOARCH>arm64</GOARCH>
71+
</environmentVariables>
72+
</configuration>
73+
</execution>
5374
<execution>
5475
<id>linux_x86_64</id>
5576
<goals>
@@ -71,6 +92,27 @@
7192
</environmentVariables>
7293
</configuration>
7394
</execution>
95+
<execution>
96+
<id>linux-aarch_64</id>
97+
<goals>
98+
<goal>exec</goal>
99+
</goals>
100+
<phase>compile</phase>
101+
<configuration>
102+
<workingDirectory>${project.basedir}/src/main/go</workingDirectory>
103+
<executable>go</executable>
104+
<arguments>
105+
<argument>build</argument>
106+
<argument>-o</argument>
107+
<argument>${project.build.directory}/${binary.name}-${project.version}-linux-aarch_64.exe</argument>
108+
<argument>.</argument>
109+
</arguments>
110+
<environmentVariables>
111+
<GOOS>linux</GOOS>
112+
<GOARCH>arm64</GOARCH>
113+
</environmentVariables>
114+
</configuration>
115+
</execution>
74116
<execution>
75117
<id>windows_x86_64</id>
76118
<goals>
@@ -115,6 +157,21 @@
115157
</artifacts>
116158
</configuration>
117159
</execution>
160+
<execution>
161+
<id>osx-aarch_64</id>
162+
<goals>
163+
<goal>attach-artifact</goal>
164+
</goals>
165+
<configuration>
166+
<artifacts>
167+
<artifact>
168+
<file>${project.build.directory}/${binary.name}-${project.version}-osx-aarch_64.exe</file>
169+
<type>exe</type>
170+
<classifier>osx-aarch_64</classifier>
171+
</artifact>
172+
</artifacts>
173+
</configuration>
174+
</execution>
118175
<execution>
119176
<id>linux_x86_64</id>
120177
<goals>
@@ -130,6 +187,21 @@
130187
</artifacts>
131188
</configuration>
132189
</execution>
190+
<execution>
191+
<id>linux-aarch_64</id>
192+
<goals>
193+
<goal>attach-artifact</goal>
194+
</goals>
195+
<configuration>
196+
<artifacts>
197+
<artifact>
198+
<file>${project.build.directory}/${binary.name}-${project.version}-linux-aarch_64.exe</file>
199+
<type>exe</type>
200+
<classifier>linux-aarch_64</classifier>
201+
</artifact>
202+
</artifacts>
203+
</configuration>
204+
</execution>
133205
<execution>
134206
<id>windows-x86_64</id>
135207
<goals>

‎canteen/canteen-it/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,6 @@
1919
<artifactId>canteen-it</artifactId>
2020

2121
<dependencies>
22-
<dependency>
23-
<groupId>com.google.guava</groupId>
24-
<artifactId>guava</artifactId>
25-
<version>24.1.1-jre</version>
26-
</dependency>
2722
<dependency>
2823
<groupId>junit</groupId>
2924
<artifactId>junit</artifactId>

‎canteen/canteen-it/src/main/java/com/salesforce/servicelibs/canteen/it/Main.java

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,29 @@
77

88
package com.salesforce.servicelibs.canteen.it;
99

10-
import com.google.common.base.Strings;
11-
1210
import java.io.BufferedReader;
1311
import java.io.InputStreamReader;
1412

13+
/**
14+
* This program does nothing useful. It's only serves as a java program to bundle with Canteen.
15+
*/
1516
public final class Main {
1617
private Main() { }
1718

1819
private static final int THE_ANSWER_TO_EVERYTHING = 42;
1920

21+
/**
22+
* Succeed or fail on command.
23+
* @param args 1, 0, or nothing
24+
* @throws Exception if something breaks
25+
*/
2026
public static void main(String[] args) throws Exception {
2127
String choice;
2228

2329
if (args.length == 1) {
2430
choice = args[0];
2531
} else {
26-
System.out.print("1 = Success, 0 = Failure >" + Strings.repeat(" ", 2));
32+
System.out.print("1 = Success, 0 = Failure > ");
2733
BufferedReader br = new BufferedReader(new InputStreamReader(System.in));
2834
choice = br.readLine();
2935
}

‎canteen/canteen-maven-plugin/src/main/java/com/salesforce/servicelibs/canteen/BootstrapMojo.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,14 @@
3535
import static java.util.Collections.emptyMap;
3636
import static java.util.Collections.singleton;
3737

38+
/**
39+
* BootstrapMojo creates new Maven artifacts for each supported platform by prepending the platform-specific
40+
* bootstrap to the default artifact jar file.
41+
*/
3842
@Mojo(name = "bootstrap", defaultPhase = LifecyclePhase.PACKAGE, requiresDependencyResolution = ResolutionScope.COMPILE, threadSafe = true)
3943
public class BootstrapMojo extends AbstractMojo {
4044
private static final String CANTEEN_BOOTSTRAP = "canteen-bootstrap";
41-
private static final List<String> PLATFORMS = Arrays.asList("osx-x86_64", "linux-x86_64", "windows-x86_64");
45+
private static final List<String> PLATFORMS = Arrays.asList("osx-x86_64", "osx-aarch_64", "linux-x86_64", "linux-aarch_64", "windows-x86_64");
4246

4347
@Component
4448
private RepositorySystem repositorySystem;

0 commit comments

Comments
 (0)