Skip to content

Commit b19e785

Browse files
Davide Melfidarklight3it
authored andcommitted
build: removed useless profile specific builds
1 parent 7009128 commit b19e785

11 files changed

Lines changed: 27 additions & 135 deletions

File tree

.github/workflows/runtime-interface-client_pr.yml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,7 @@ jobs:
4646
working-directory: ./aws-lambda-java-runtime-interface-client
4747
run: make pr
4848
env:
49-
<<<<<<< HEAD
50-
IS_JAVA_8: true
51-
=======
5249
IS_JAVA_8: ${{ matrix.java-version == 8 }}
53-
>>>>>>> c093beb (ci: dependent library test fan out)
5450

5551
build:
5652
runs-on: ubuntu-latest

.gitignore

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ dependency-reduced-pom.xml
2222
.settings
2323
.classpath
2424
.project
25+
.factorypath
2526

2627
# OSX
2728
.DS_Store
@@ -38,8 +39,6 @@ experimental/aws-lambda-java-profiler/integration_tests/helloworld/bin
3839
.vscode
3940
.kiro
4041
build
41-
<<<<<<< HEAD
42-
=======
4342

4443
# Logs
4544
*.log
@@ -52,5 +51,4 @@ build
5251
*.swo
5352

5453
# Tool version manager
55-
>>>>>>> 45b43fe (chore: adding other files to .gitignore)
5654
mise.toml

aws-lambda-java-events-sdk-transformer/pom.xml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,9 @@
3838
<maven.compiler.target>1.8</maven.compiler.target>
3939
<sdk.v1.version>1.11.914</sdk.v1.version>
4040
<sdk.v2.version>2.15.40</sdk.v2.version>
41-
<<<<<<< HEAD
42-
<junit-jupiter.version>5.12.2</junit-jupiter.version>
43-
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
44-
=======
4541
<junit-jupiter.version>5.14.3</junit-jupiter.version>
46-
>>>>>>> 7946ec4 (build: upgrading junit-jupiter everywhere)
42+
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
43+
4744
</properties>
4845

4946
<distributionManagement>

aws-lambda-java-events/.factorypath

Lines changed: 0 additions & 4 deletions
This file was deleted.

aws-lambda-java-events/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@
3939
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
4040
<jackson.version>2.20.1</jackson.version>
4141
<json.unit>2.40.1</json.unit>
42-
<<<<<<< HEAD
43-
<junit-jupiter.version>5.12.2</junit-jupiter.version>
44-
=======
4542
<junit-jupiter.version>5.14.3</junit-jupiter.version>
46-
>>>>>>> 7946ec4 (build: upgrading junit-jupiter everywhere)
4743
</properties>
4844

4945
<distributionManagement>

aws-lambda-java-log4j2/.factorypath

Lines changed: 0 additions & 5 deletions
This file was deleted.

aws-lambda-java-runtime-interface-client/Makefile

Lines changed: 24 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,57 +15,63 @@ endif
1515
# making it possible to publish resulting artifacts to a codeartifact maven repository
1616
-include ric-dev-environment/codeartifact-repo.mk
1717

18-
.PHONY: target
18+
1919
target:
2020
$(info ${HELP_MESSAGE})
2121
@exit 0
2222

23-
.PHONY: test
23+
2424
test:
2525
mvn test $(EXTRA_LOAD_ARG)
2626

27-
.PHONY: setup-codebuild-agent
27+
2828
setup-codebuild-agent:
2929
docker build -t codebuild-agent \
3030
--build-arg ARCHITECTURE=$(ARCHITECTURE_ALIAS) \
3131
- < test/integration/codebuild-local/Dockerfile.agent
3232

33-
.PHONY: test-smoke
33+
3434
test-smoke: setup-codebuild-agent
3535
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/amd64
3636
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.alpine.yml alpine 3.15 corretto11 linux/arm64/v8
3737
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11 linux/amd64
3838
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_one.sh test/integration/codebuild/buildspec.os.amazoncorretto.yml amazoncorretto amazoncorretto 11 linux/arm64/v8
3939

40-
.PHONY: test-integ
40+
4141
test-integ: setup-codebuild-agent
4242
CODEBUILD_IMAGE_TAG=codebuild-agent test/integration/codebuild-local/test_all.sh test/integration/codebuild
4343

4444
# Command to run everytime you make changes to verify everything works
45-
.PHONY: dev
45+
4646
dev: test
4747

4848
# Verifications to run before sending a pull request
49-
.PHONY: pr
49+
5050
pr: test test-smoke
5151

52-
.PHONY: build
52+
53+
# The default `mvn clean install` builds all 4 native .so variants (x86_64/aarch64 × glibc/musl)
54+
# and bundles them into a single jar (see build-jni-lib.sh), runs the tests for the host
55+
# environment, and updates coverage data. This is sufficient for what we want to do here.
56+
#
57+
# Running profile-specific builds (e.g., `mvn install -P linux-aarch64`) does NOT test the
58+
# cross-compiled .so — JniHelper.load() tries each .so in order and always loads the first
59+
# one matching the host platform (linux-x86_64 on GitHub Actions runners), so the other
60+
# variants are never exercised.
61+
#
62+
# Platform-specific tests are run through test-smoke via codebuild containers.
63+
5364
build:
54-
mvn clean install $(EXTRA_LOAD_ARG)
55-
mvn install -P linux-x86_64 $(EXTRA_LOAD_ARG)
56-
mvn install -P linux_musl-x86_64 $(EXTRA_LOAD_ARG)
57-
mvn install -P linux-aarch64 $(EXTRA_LOAD_ARG)
58-
mvn install -P linux_musl-aarch64 $(EXTRA_LOAD_ARG)
65+
mvn clean install $(EXTRA_LOAD_ARG)
5966

60-
.PHONY: publish
6167
publish:
6268
./ric-dev-environment/publish_snapshot.sh
6369

64-
.PHONY: publish
70+
6571
test-publish:
6672
./ric-dev-environment/test-platform-specific-jar-snapshot.sh
6773

68-
.PHONY: test-rie
74+
6975
test-rie:
7076
./scripts/test-rie.sh "EchoHandler::handleRequest"
7177

@@ -80,3 +86,5 @@ TARGETS
8086
test Run the Unit tests.
8187
test-rie Build and test RIC locally with Lambda Runtime Interface Emulator. (Requires building the project first)
8288
endef
89+
90+
.PHONY: target test setup-codebuild-agent test-smoke test-integ dev pr build publish publish test-rie

aws-lambda-java-runtime-interface-client/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,7 @@
3737
<jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>
3838
<maven-install-plugin.version>2.4</maven-install-plugin.version>
3939
<maven-deploy-plugin.version>3.1.1</maven-deploy-plugin.version>
40-
<<<<<<< HEAD
41-
<junit-jupiter.version>5.12.2</junit-jupiter.version>
42-
=======
4340
<junit-jupiter.version>5.14.3</junit-jupiter.version>
44-
>>>>>>> 7946ec4 (build: upgrading junit-jupiter everywhere)
4541
<maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
4642
<maven-surefire-plugin.version>3.5.4</maven-surefire-plugin.version>
4743
<!--

aws-lambda-java-tests/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,12 @@
3333
<maven.compiler.source>1.8</maven.compiler.source>
3434
<maven.compiler.target>1.8</maven.compiler.target>
3535
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
36-
<<<<<<< HEAD
3736
<!--
3837
JUnit is a compile-scope transitive dependency for consumers of this module.
3938
Upgrading it requires a version bump of aws-lambda-java-tests to avoid
4039
breaking customers who don't pin their own JUnit version.
4140
-->
42-
<junit.version>5.9.2</junit.version>
43-
=======
4441
<junit.version>5.14.3</junit.version>
45-
>>>>>>> 7946ec4 (build: upgrading junit-jupiter everywhere)
4642
<jacoco.maven.plugin.version>0.8.7</jacoco.maven.plugin.version>
4743
<aws-lambda-java-serialization.version>1.4.0</aws-lambda-java-serialization.version>
4844
<aws-lambda-java-events.version>3.16.1</aws-lambda-java-events.version>

experimental/aws-lambda-java-profiler/examples/cdk/pom.xml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,7 @@
1111
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
1212
<cdk.version>2.155.0</cdk.version>
1313
<constructs.version>[10.0.0,11.0.0)</constructs.version>
14-
<<<<<<< HEAD
15-
<junit.version>5.12.2</junit.version>
16-
=======
1714
<junit.version>5.14.3</junit.version>
18-
>>>>>>> 7946ec4 (build: upgrading junit-jupiter everywhere)
1915
</properties>
2016

2117
<build>

0 commit comments

Comments
 (0)