Skip to content

Commit 15df8f3

Browse files
authored
Merge pull request #153 from linyimin0812/dev/20240509_use_skip_tests_in_release_flow_1
dev: skip test in release flow
2 parents ac32a18 + e67c661 commit 15df8f3

2 files changed

Lines changed: 47 additions & 2 deletions

File tree

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
restore-keys: ${{ runner.os }}-m2
7171

7272
- name: Build spring-startup-analyzer
73-
run: make all
73+
run: make all-skip-tests
7474

7575
- name: Package plugin and create userscript
7676
run: |

Makefile

Lines changed: 46 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,16 @@ else
1212
cd ./spring-profiler-extension && $(MVN) clean -Drevision=$(VERSION)
1313
endif
1414

15+
.PHONY: clean-skip-tests
16+
clean-skip-tests:
17+
ifeq ($(strip $(VERSION)),)
18+
$(MVN) clean -Dmaven.test.skip=true
19+
cd ./spring-profiler-extension && $(MVN) clean -Dmaven.test.skip=true
20+
else
21+
$(MVN) clean -Drevision=$(VERSION) -Dmaven.test.skip=true
22+
cd ./spring-profiler-extension && $(MVN) clean -Drevision=$(VERSION) -Dmaven.test.skip=true
23+
endif
24+
1525
.PHONY: package
1626
package: clean install
1727
ifeq ($(strip $(VERSION)),)
@@ -24,6 +34,18 @@ endif
2434
mkdir -p ./build && rm -rf ./build/* && cp -r ~/${PROJECT_NAME}/* ./build/ && rm -rf ./build/${PROJECT_NAME}.tar.gz
2535

2636

37+
.PHONY: package-skip-tests
38+
package-skip-tests: clean-skip-tests install-skip-tests
39+
ifeq ($(strip $(VERSION)),)
40+
${MVN} package -pl '!coverage-report-aggregate,!spring-startup-cli' -Dmaven.test.skip=true
41+
cd ./spring-profiler-extension && ${MVN} package -Dmaven.test.skip=true
42+
else
43+
${MVN} package -Drevision=$(VERSION) -pl '!coverage-report-aggregate,!spring-startup-cli' -Dmaven.test.skip=true
44+
cd ./spring-profiler-extension && ${MVN} package -Drevision=$(VERSION) -Dmaven.test.skip=true
45+
endif
46+
mkdir -p ./build && rm -rf ./build/* && cp -r ~/${PROJECT_NAME}/* ./build/ && rm -rf ./build/${PROJECT_NAME}.tar.gz
47+
48+
2749
.PHONY: install
2850
install: clean
2951
ifeq ($(strip $(VERSION)),)
@@ -34,6 +56,16 @@ else
3456
cd ./spring-profiler-extension && ${MVN} install -Drevision=$(VERSION)
3557
endif
3658

59+
.PHONY: install-skip-tests
60+
install-skip-tests: clean-skip-tests
61+
ifeq ($(strip $(VERSION)),)
62+
${MVN} install -pl '!coverage-report-aggregate,!spring-startup-cli' -Dmaven.test.skip=true
63+
cd ./spring-profiler-extension && ${MVN} install -Dmaven.test.skip=true
64+
else
65+
${MVN} install -Drevision=$(VERSION) -pl '!coverage-report-aggregate,!spring-startup-cli' -Dmaven.test.skip=true
66+
cd ./spring-profiler-extension && ${MVN} install -Drevision=$(VERSION) -Dmaven.test.skip=true
67+
endif
68+
3769
.PHONY: deploy
3870
deploy: clean
3971
ifeq ($(strip $(VERSION)),)
@@ -44,6 +76,16 @@ else
4476
cd ./spring-profiler-extension && ${MVN} deploy -Drevision=$(VERSION)
4577
endif
4678

79+
.PHONY: deploy-skip-tests
80+
deploy-skip-tests: clean-skip-tests
81+
ifeq ($(strip $(VERSION)),)
82+
${MVN} deploy -pl '!coverage-report-aggregate,!spring-startup-cli' -Dmaven.test.skip=true
83+
cd ./spring-profiler-extension && ${MVN} deploy -Dmaven.test.skip=true
84+
else
85+
${MVN} deploy -Drevision=$(VERSION)
86+
cd ./spring-profiler-extension && ${MVN} deploy -Drevision=$(VERSION) -Dmaven.test.skip=true
87+
endif
88+
4789
.PHONY: docker-build
4890
docker-build: package
4991
ifeq ($(strip $(VERSION)),)
@@ -58,4 +100,7 @@ tar:
58100
cd ${INSTALL_DIR} && tar -zcvf ${PROJECT_NAME}.tar.gz ./lib/ ./config/ ./template
59101

60102
.PHONY: all
61-
all: clean install package tar
103+
all: clean install package tar
104+
105+
.PHONY: all-skip-tests
106+
all-skip-tests: clean-skip-tests install-skip-tests package-skip-tests tar

0 commit comments

Comments
 (0)