Skip to content

Commit

Permalink
feat: remove scala12 profile in script (#3651)
Browse files Browse the repository at this point in the history
Signed-off-by: sunlichao11 <[email protected]>
Co-authored-by: sunlichao11 <[email protected]>
  • Loading branch information
leechor and sunlichao11 authored Jul 18, 2024
1 parent 5ed1fc6 commit b833ef0
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 12 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/auto-realease-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ jobs:
-Dspotless.check.skip=true \
-Denforcer.skip=false \
-Dmaven.javadoc.skip=true \
-Pprod,scala-2.12,flink-single-version,flink-1.14,maven-central,web,fast \
-Pprod,flink-single-version,flink-1.14,maven-central,web,fast \
--no-snapshot-updates
- name: "Build Dinky ${{ inputs.version }} with Fink 1.15 Pre Release/Release Artifact"
id: build_dinky1_15
Expand All @@ -72,7 +72,7 @@ jobs:
-Dspotless.check.skip=true \
-Denforcer.skip=false \
-Dmaven.javadoc.skip=true \
-Pprod,scala-2.12,flink-single-version,flink-1.15,maven-central,web,fast \
-Pprod,flink-single-version,flink-1.15,maven-central,web,fast \
--no-snapshot-updates
- name: "Build Dinky ${{ inputs.version }} with Fink 1.16 Pre Release/Release Artifact"
Expand All @@ -83,7 +83,7 @@ jobs:
-Dspotless.check.skip=true \
-Denforcer.skip=false \
-Dmaven.javadoc.skip=true \
-Pprod,scala-2.12,flink-single-version,flink-1.16,maven-central,web,fast \
-Pprod,flink-single-version,flink-1.16,maven-central,web,fast \
--no-snapshot-updates
- name: "Build Dinky ${{ inputs.version }} with Fink 1.17 Pre Release/Release Artifact"
Expand All @@ -94,7 +94,7 @@ jobs:
-Dspotless.check.skip=true \
-Denforcer.skip=false \
-Dmaven.javadoc.skip=true \
-Pprod,scala-2.12,flink-single-version,flink-1.17,maven-central,web,fast \
-Pprod,flink-single-version,flink-1.17,maven-central,web,fast \
--no-snapshot-updates
- name: "Build Dinky ${{ inputs.version }} with Fink 1.18 Pre Release/Release Artifact"
Expand All @@ -105,7 +105,7 @@ jobs:
-Dspotless.check.skip=true \
-Denforcer.skip=false \
-Dmaven.javadoc.skip=true \
-Pprod,scala-2.12,flink-single-version,flink-1.18,maven-central,web,fast \
-Pprod,flink-single-version,flink-1.18,maven-central,web,fast \
--no-snapshot-updates
- name: Automatic Upload Releases to GitHub Releases Page
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/backend.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ jobs:
-Dspotless.check.skip=true \
-Denforcer.skip=false \
-Dmaven.javadoc.skip=true \
-P prod,scala-2.12,flink-single-version,flink-${{ matrix.flink }},maven-central \
-P prod,flink-single-version,flink-${{ matrix.flink }},maven-central \
--no-snapshot-updates
# 检查打包的大小
Expand Down
2 changes: 1 addition & 1 deletion build-extr.sh
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ while getopts "j:f:" opt; do
done

# 构建命令
CMD="./mvnw clean package -Dmaven.test.skip=true -P prod,${JDK_VERSION},flink-single-version,scala-2.12,aliyun,${FLINK_VERSION},web"
CMD="./mvnw clean package -Dmaven.test.skip=true -P prod,${JDK_VERSION},flink-single-version,aliyun,${FLINK_VERSION},web"

# 执行构建命令
echo "执行命令: $CMD"
Expand Down
2 changes: 1 addition & 1 deletion build.cmd
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ echo "Clean Project ..."
call ./mvnw.cmd clean -f pom.xml

echo "Build Project ..."
call ./mvnw.cmd package -f pom.xml -D"maven.test.skip=true" -P aliyun,prod,scala-2.12,web,flink-1.14
call ./mvnw.cmd package -f pom.xml -D"maven.test.skip=true" -P aliyun,prod,web,flink-1.14

:exit
pause
2 changes: 1 addition & 1 deletion build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

./mvnw clean package -Dmaven.test.skip=true -P aliyun,prod,scala-2.12,web,flink-1.14
./mvnw clean package -Dmaven.test.skip=true -P aliyun,prod,web,flink-1.14
2 changes: 1 addition & 1 deletion deploy/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ ENV DINKY_VERSION=${DINKY_VERSION}
ADD . .
COPY --from=ui-build /build/dist/ /build/dinky-web/dist/

RUN mvn package -Dmaven.test.skip=true -P prod,scala-2.12,flink-single-version,flink-${FLINK_VERSION},fast
RUN mvn package -Dmaven.test.skip=true -P prod,flink-single-version,flink-${FLINK_VERSION},fast
RUN mkdir release && \
tar -C release -xvf build/dinky-release-${FLINK_VERSION}-${DINKY_VERSION}.tar.gz && \
mv release/dinky-release-* release/dinky
Expand Down
2 changes: 1 addition & 1 deletion docs/docs/deploy_guide/compile_deploy.md
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ git clone https://github.com/DataLinkDC/dinky.git
cd /opt/dinky-source-code

# 编译打包 Profile, 注意 scala 支持 2.11 和 2.12, 请根据实际情况进行选择,jdk 支持 8/11,请根据实际情况进行选择,不选jdk11默认使用系统内的jdk8
mvn clean package -DskipTests=true -P prod,jdk11,flink-single-version,scala-2.12,aliyun,flink-1.16,web
mvn clean package -DskipTests=true -P prod,jdk11,flink-single-version,aliyun,flink-1.16,web

```

Expand Down
2 changes: 1 addition & 1 deletion docs/docs/developer_guide/contribution/pull_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Pull Request 本质上是一种软件的合作方式,是将涉及不同功能

1. 在提交 pull request 前格式化你的代码:执行 `mvn spotless:apply -P flink-all` 自动格式化。格式化代码的最佳时间是将你的修改提交到本地 git 版本库之前

2. 在提交 pull request 前编译整个项目:在 IDEA 中的 Profiles 中选择 aliyun,flink-all,nexus,prod,scala-2.12,web,重载项目后执行 `mvn clean install -P aliyun,prod,scala-2.12,web,flink-all`,编译成功后即可提交代码
2. 在提交 pull request 前编译整个项目:在 IDEA 中的 Profiles 中选择 aliyun,flink-all,nexus,prod,web,重载项目后执行 `mvn clean install -P aliyun,prod,scala-2.12,web,flink-all`,编译成功后即可提交代码

### 相关问题

Expand Down

0 comments on commit b833ef0

Please sign in to comment.