Skip to content

Commit 6bf9e23

Browse files
repolevedavajrepolevedavaj
committed
Switch to amd64 on macos
1 parent de98ba9 commit 6bf9e23

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

‎.github/workflows/build.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@ jobs:
1414
- os: ubuntu-latest
1515
cli_assembly_id: linux-amd64
1616
cli_assembly_format: tar.gz
17+
cli_assembly_arch: x86-64-v3
1718
- os: windows-latest
1819
cli_assembly_id: windows-amd64
1920
cli_assembly_format: zip
21+
cli_assembly_arch: x86-64-v3
2022
gu_executable_ext: .cmd
2123
- os: macos-latest
22-
cli_assembly_id: macos-aarch64
24+
cli_assembly_id: macos-amd64
2325
cli_assembly_format: tar.gz
26+
cli_assembly_arch: x86-64-v3
2427
steps:
2528
- uses: ilammy/msvc-dev-cmd@v1
2629
if: ${{ matrix.os == 'windows-latest'}}
@@ -42,13 +45,13 @@ jobs:
4245
with:
4346
nsis-version: 3.08
4447
if: ${{ matrix.os == 'windows-latest'}}
45-
- run: mvn -B -s etc/m2/settings.xml verify -Pnative-image -Psonar "-Dcli.assembly.id=${{ matrix.cli_assembly_id }}" "-Dcli.assembly.format=${{ matrix.cli_assembly_format }}"
48+
- run: mvn -B -s etc/m2/settings.xml verify -Pnative-image -Psonar "-Dcli.assembly.id=${{ matrix.cli_assembly_id }}" "-Dcli.assembly.format=${{ matrix.cli_assembly_format }}" "-Dcli_assembly_arch=${{ matrix.cli_assembly_arch }}"
4649
if: ${{ matrix.os == 'ubuntu-latest' && github.actor != 'dependabot[bot]' }}
4750
env:
4851
GITHUB_USER: ${{ github.actor }}
4952
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5053
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
51-
- run: mvn -B -s etc/m2/settings.xml verify -Pnative-image "-Dcli.assembly.id=${{ matrix.cli_assembly_id }}" "-Dcli.assembly.format=${{ matrix.cli_assembly_format }}"
54+
- run: mvn -B -s etc/m2/settings.xml verify -Pnative-image "-Dcli.assembly.id=${{ matrix.cli_assembly_id }}" "-Dcli.assembly.format=${{ matrix.cli_assembly_format }}" "-Dcli_assembly_arch=${{ matrix.cli_assembly_arch }}"
5255
if: ${{ matrix.os != 'ubuntu-latest' || github.actor == 'dependabot[bot]' }}
5356
env:
5457
GITHUB_USER: ${{ github.actor }}

‎.github/workflows/release.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,16 @@ jobs:
3434
- os: ubuntu-latest
3535
cli_assembly_id: linux-amd64
3636
cli_assembly_format: tar.gz
37+
cli_assembly_arch: x86-64-v3
3738
- os: windows-latest
3839
cli_assembly_id: windows-amd64
3940
cli_assembly_format: zip
41+
cli_assembly_arch: x86-64-v3
4042
gu_executable_ext: .cmd
4143
- os: macos-latest
42-
cli_assembly_id: macos-aarch64
44+
cli_assembly_id: macos-amd64
4345
cli_assembly_format: tar.gz
46+
cli_assembly_arch: x86-64-v3
4447
steps:
4548
- uses: ilammy/msvc-dev-cmd@v1
4649
if: ${{ matrix.os == 'windows-latest'}}
@@ -57,13 +60,13 @@ jobs:
5760
with:
5861
nsis-version: 3.08
5962
if: ${{ matrix.os == 'windows-latest'}}
60-
- run: mvn -B -s etc/m2/settings.xml deploy -Pnative-image "-Drevision=${{ needs.create-release.outputs.revision }}" "-Dcli.assembly.id=${{ matrix.cli_assembly_id }}" "-Dcli.assembly.format=${{ matrix.cli_assembly_format }}"
63+
- run: mvn -B -s etc/m2/settings.xml deploy -Pnative-image "-Drevision=${{ needs.create-release.outputs.revision }}" "-Dcli.assembly.id=${{ matrix.cli_assembly_id }}" "-Dcli.assembly.format=${{ matrix.cli_assembly_format }}" "-Dcli_assembly_arch=${{ matrix.cli_assembly_arch }}"
6164
if: ${{ matrix.os == 'ubuntu-latest' }}
6265
env:
6366
GITHUB_USER: ${{ github.actor }}
6467
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
6568
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
66-
- run: mvn -B -s etc/m2/settings.xml verify -Pnative-image "-Drevision=${{ needs.create-release.outputs.revision }}" "-Dcli.assembly.id=${{ matrix.cli_assembly_id }}" "-Dcli.assembly.format=${{ matrix.cli_assembly_format }}"
69+
- run: mvn -B -s etc/m2/settings.xml verify -Pnative-image "-Drevision=${{ needs.create-release.outputs.revision }}" "-Dcli.assembly.id=${{ matrix.cli_assembly_id }}" "-Dcli.assembly.format=${{ matrix.cli_assembly_format }}" "-Dcli_assembly_arch=${{ matrix.cli_assembly_arch }}"
6770
if: ${{ matrix.os != 'ubuntu-latest' }}
6871
env:
6972
GITHUB_USER: ${{ github.actor }}

‎code/cli/pom.xml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
<artifactId>cli</artifactId>
1313

1414
<properties>
15-
<cli.binary>project-env-cli</cli.binary>
15+
<cli.binary.name>project-env-cli</cli.binary.name>
1616
<cli.assembly.id>binary</cli.assembly.id>
1717
<cli.assembly.format>tar.gz</cli.assembly.format>
18+
<cli.binary.arch>x86-64-v3</cli.binary.arch>
1819
</properties>
1920

2021
<dependencies>
@@ -154,9 +155,10 @@
154155
<buildArg>--enable-url-protocols=https</buildArg>
155156
<buildArg>--no-fallback</buildArg>
156157
<buildArg>--features=io.projectenv.core.cli.nativeimage.ProjectEnvFeature</buildArg>
158+
<buildArg>-march=${cli.binary.arch}</buildArg>
157159
</buildArgs>
158160
<mainClass>io.projectenv.core.cli.ProjectEnvCli</mainClass>
159-
<imageName>${cli.binary}</imageName>
161+
<imageName>${cli.binary.name}</imageName>
160162
</configuration>
161163
</plugin>
162164
<plugin>

‎code/cli/src/assembly/assembly.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<directory>${project.build.directory}</directory>
1717
<outputDirectory>.</outputDirectory>
1818
<includes>
19-
<include>${cli.binary}*</include>
19+
<include>${cli.binary.name}*</include>
2020
<include>*.dll</include>
2121
</includes>
2222
<excludes>

0 commit comments

Comments
 (0)