Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge from dev/4.3.0 into main #2732

Merged
merged 133 commits into from
Jun 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
133 commits
Select commit Hold shift + click to select a range
33ced83
build: upgrade odc version to v4.3.0 (#2159)
yhilmare Apr 7, 2024
485d78b
fix(web-framework): swagger-ui.html page 404 notfound (#2160)
yizhouxw Apr 7, 2024
cb13278
feat(collaboration): support for configuring database administrators …
smallsheeeep Apr 12, 2024
9138a22
feat(logicaldatabase): supports automatic recognition of logical tabl…
MarkPotato777 Apr 15, 2024
2d6cd47
merge from main into dev/4.3.x (#2207)
yhilmare Apr 15, 2024
f4e5e31
feat(object-search): persistence and service layer implementation (#2…
smallsheeeep Apr 15, 2024
7e73479
feat(ob-sql-parser): upgrade antlr g4 for oceanbase v4.3.0 (#2124)
yizhouxw Apr 16, 2024
f8bed43
feat(query-profile): add DTO and VO models for query profile (#2212)
LuckyPickleZZ Apr 16, 2024
3b9abad
feat(resultset): supports gis datatype for ob oracle mode (#2216)
PeachThinking Apr 16, 2024
3d7eaf5
feat(datatype): update odc_version_diff_config for ob oracle SDO_GEOM…
PeachThinking Apr 16, 2024
569f452
feat(multiple databases changes): add new feature for multiple databa…
zijiacj Apr 18, 2024
853dedc
fix(sql-execute): failed to kill query (#2259)
yhilmare Apr 19, 2024
b9ea0aa
feat(iam): password strength match oceanbase style (#2247)
yizhouxw Apr 22, 2024
ac802de
feat(object-search): database schema synchronizing implementation (#2…
smallsheeeep Apr 25, 2024
acb58ac
refactor(sql-execute): refactor SQL async execute api into streaming …
LuckyPickleZZ Apr 28, 2024
2291333
feat(logicaldatabase): logical table expression parser (#2274)
MarkPotato777 Apr 29, 2024
8fcdb23
fix(db-browser): partition definitions is not ordered (#2328)
yhilmare May 8, 2024
8131efd
feat(column-group): add support of column group into ob-sql-parser (…
LuckyPickleZZ May 8, 2024
d14984f
build: upgrade workflow action version to v4 (#2338)
smallsheeeep May 8, 2024
fb4bd19
feat(object-management): add accessor and service support for column-…
LuckyPickleZZ May 13, 2024
b4e81f2
fix(data-masking): unavailable when existing invalid database with du…
smallsheeeep May 13, 2024
6a0eaea
feat(migrate): add unique identifier in collaboration project (#2372)
PeachThinking May 13, 2024
b7605ac
feat(migrate): migrate history uniqueIdentifier in collaboration_proj…
PeachThinking May 14, 2024
bae5dd8
feat(dlm): incremenntal table structure synchronization (#2189)
guowl3 May 15, 2024
5f97f93
Merge branch 'main' of https://github.com/oceanbase/odc into merge_fr…
yhilmare May 15, 2024
7137d41
merge from main into dev/4.3.x (#2397)
yhilmare May 15, 2024
3e95850
docs: fix errors in international translation (#2399)
yhilmare May 15, 2024
c52d391
feat(dlm): data clearing tasks support data check before delete (#2401)
kiko-art May 15, 2024
b92222c
builds: support build rpm and docker image in aarch64 (#2404)
smallsheeeep May 16, 2024
df00feb
chore: use OBE error code (#2413)
yizhouxw May 17, 2024
92dd2e5
feat(dlm): supports viewing schedule task details (#2354)
guowl3 May 17, 2024
7592ef8
merge from main into dev/4.3.0 (#2424)
yhilmare May 17, 2024
879a89d
fix(schema-plugin):fix table ddl do not show unique index when table …
PeachThinking May 20, 2024
b15f00b
fix(schema-plugin): remove the logic that automatically converts tabl…
PeachThinking May 20, 2024
714a327
fix(database-permission): could not call inside dbms package in SQL c…
smallsheeeep May 20, 2024
48a1cf2
feat(databasechange): implement the new interface and flow of multipl…
zijiacj May 20, 2024
67fccf2
fix(notification): DLM events were missed when task framework not ena…
LuckyPickleZZ May 21, 2024
f45e6b6
fix(flow): optimize flow submitter about exception handler (#2431)
krihy May 22, 2024
1687ffe
fix(dlm): archiving specified partition failed (#2474)
guowl3 May 22, 2024
d9be519
feat(object-search): individual space support global object search (#…
smallsheeeep May 23, 2024
743b228
feat(notification): notification support multiple database change tas…
LuckyPickleZZ May 23, 2024
233551f
fix(project): optimize error message when update a project name to an…
MarkPotato777 May 23, 2024
7f1f6f1
feat(data-transfer): apply jdbc parameters and scripts in connection …
LuckyPickleZZ May 23, 2024
daf881f
fix(dlm): sync table structure failed #2489
guowl3 May 24, 2024
1661b92
fix(dlm): optimize error message (#2498)
guowl3 May 27, 2024
67de919
feat(multipledatabase): add audit events for multiple databases (#2442)
zijiacj May 27, 2024
042bf99
enhancement(flow): add heartbeat for flow task (#2468)
yhilmare May 27, 2024
1163f55
fix(session): failed to set nls parameters for native oracle in sql-c…
yhilmare May 27, 2024
1cd548c
fix(db-browser): adaption for ALL_TAB_COLS.USER_GENERATED in ob oracl…
PeachThinking May 28, 2024
d20d952
enhancement(connection): optimize error message when testing the conn…
MarkPotato777 May 28, 2024
163ad7c
fix(multiple databases): database changing order in template cannot b…
zijiacj May 28, 2024
7471c9b
fix(object-search): bad performance when syncing table or view column…
smallsheeeep May 28, 2024
75cf8cd
fix(connection): concurrent exception will be thrown when a connectio…
yhilmare May 28, 2024
314a2a2
fix(dlm): set default value is source table name if data cleaning tar…
kiko-art May 29, 2024
ba64230
fix(multiple database): hover the template name does not show the con…
zijiacj May 29, 2024
306b89f
fix(web): cannot return a page with more than 2000 records (#2520)
MarkPotato777 May 29, 2024
e4a3243
fix(database): database sync involved no-privilege databases in OBMyS…
MarkPotato777 May 29, 2024
c07af8a
fix(flow): failed to create a ticket which manual strategy in individ…
yiminpeng May 29, 2024
502a7ea
fix(integration): basic auth miss authentication initialization (#2549)
yizhouxw May 29, 2024
52e582b
fix(dlm): table structure synchronization failure when table names ar…
guowl3 May 29, 2024
75190cd
fix(multiple database): the current database does not match the corre…
zijiacj May 30, 2024
703badf
fix(ticket): wrong i18n description for task (#2579)
smallsheeeep May 30, 2024
f14dd99
fix(multiple database): no execution record is generated before or du…
zijiacj May 31, 2024
8d8ea40
fix(object-search): failed to sync database metadata in individual sp…
smallsheeeep May 31, 2024
cfd0894
fix(multiple database): add project permission verification to the ex…
zijiacj May 31, 2024
07b1859
fix(collaboration): vertical unauthorizing exists when editing databa…
smallsheeeep May 31, 2024
5e5c0f1
feat(projectService): adaption for organization、project、role service …
PeachThinking May 31, 2024
c1e62f1
feat(dlm):upgrade dlm sdk version to 1.1.3 #2601
guowl3 Jun 3, 2024
014623e
fix(multiple database): optimize error message when creating and upda…
zijiacj Jun 3, 2024
2ab9636
fix(flow): the disabled user can still approving or rejecting a flow …
smallsheeeep Jun 3, 2024
0bfa172
fix(ticket): failed to approve ticket when input over-sized comment (…
smallsheeeep Jun 3, 2024
39d7fb5
fix(dlm): data delete retry failed (#2564)
guowl3 Jun 3, 2024
30507de
fix(schedule): schedule cannot be disabled if project is archived (#2…
guowl3 Jun 3, 2024
2c7f26b
fix(data-transfer): exception occurs when object exists and configur…
LuckyPickleZZ Jun 3, 2024
43532a4
fix(flow): cannot find approvers for multiple database change task wh…
smallsheeeep Jun 4, 2024
20a68f1
fix(stateful): batch compile failed with message 'stateId' (#2606)
ungreat Jun 4, 2024
e024cb9
fix(flow-task): optimize error message of flow task cancelation (#2624)
LuckyPickleZZ Jun 4, 2024
4e8ba9e
fix(deserialization): failed to deserialize the page object (#2434)
ungreat May 20, 2024
2323c34
fix(metadb): change systemConfigDao to systemConfigRepository. (#2467)
ungreat May 22, 2024
9a856cd
feat(config):add creator_id to config entity (#2485)
ungreat May 24, 2024
273ba14
refactor(config): Add more fields to configEntity #2493
ungreat May 27, 2024
a05554e
merge: pick some changes from 4.3.x to 4.3.0
yizhouxw Jun 4, 2024
b93ed6b
enhancement(db-browser): add factory for several db-browser's factory…
yhilmare Jun 4, 2024
7899b47
fix(schema): loading table detail costs too much time (#2626)
yhilmare Jun 4, 2024
f13708b
refactor(flow): add skip auth to flow mapper (#2538)
ungreat Jun 4, 2024
58bf321
fix(dlm): table not found in task framework mode (#2637)
guowl3 Jun 4, 2024
ecf7a25
fix(schema): function and procedure list is not ordered by their name…
yhilmare Jun 4, 2024
9550c60
fix(multiple database): error occurs when viewing the list without te…
zijiacj Jun 4, 2024
6e9cf9c
fix(database-permission): wrong to check DB permission when existing …
smallsheeeep Jun 4, 2024
5087d90
fix(connect): failed to connect to a standby cluster and view table s…
yhilmare Jun 5, 2024
5b40a4c
fix(collaboration): can not modify the description of project (#2642)
smallsheeeep Jun 5, 2024
15d620a
fix(schema): failed to query variables on native oracle (#2649)
yhilmare Jun 5, 2024
159fdfb
fix(dml): failed to modify data which is geometry type (#2640)
yhilmare Jun 5, 2024
84157a5
fix(structure-comparison): syntax error when executing structure comp…
yhilmare Jun 5, 2024
0a9722a
fix(multiple database): pre sql check node failed (#2592)
zijiacj Jun 5, 2024
74da7c1
fix(dlm): task timeout was not effective (#2651)
guowl3 Jun 5, 2024
db40bbe
generate changelog
guowl3 Jun 5, 2024
eb19b7f
fix(db-object): exception occurred when open oracle table in GBK enco…
LuckyPickleZZ Jun 5, 2024
45352d5
fix(parser): failed to parse json_function for native oracle (#2664)
yhilmare Jun 5, 2024
34a0d58
update change log
guowl3 Jun 5, 2024
656b30c
fix(multiple database): the method isIntercepted in multiple database…
zijiacj Jun 6, 2024
22889bf
fix(dlm): target database id is null in task framework mode (#2676)
guowl3 Jun 6, 2024
6265fe1
fix(apply database): failing to apply database permission deliver (#2…
zijiacj Jun 6, 2024
0da09e5
security: upgrade spring-security from 5.1.10 to 5.7.12, fix CVE-2024…
yizhouxw Jun 6, 2024
24c53ec
security: upgrade spring-security from 5.1.10 to 5.7.12 #2690
yizhouxw Jun 6, 2024
9eabf4b
fix(dlm): table structure synchronization failed (#2682)
guowl3 Jun 6, 2024
a91c335
fix(data-transfer): truncate will cause the import task to fail (#2679)
LuckyPickleZZ Jun 6, 2024
4892a41
fix failed to bootstrap
yhilmare Jun 6, 2024
b7cf932
format the code
yhilmare Jun 6, 2024
396ea94
fix(desktop): failed to bootstrap odc when upgrading from the version…
yizhouxw Jun 6, 2024
dd71873
fix(multiple database): the return of method intercepted in multiple …
zijiacj Jun 6, 2024
3a54f53
response comments
guowl3 Jun 6, 2024
422a801
enhancement(flowable): adding indexes to improve query efficiency of …
LuckyPickleZZ Jun 7, 2024
439d036
fix(dlm): alter execute task job type for data cleaning (#2706)
kiko-art Jun 7, 2024
34dad78
fix(security): add skip auth annotation (#2704)
guowl3 Jun 7, 2024
cb6ee99
Merge branch 'dev/4.3.0' into tianke_changelog
guowl3 Jun 7, 2024
4c6ee6c
regenereate changelog`
guowl3 Jun 7, 2024
8c19f9e
fix(db-browser): failed to open SYS console when user without query s…
PeachThinking Jun 7, 2024
bf4e72f
fix(ticket): project owners failed to abort a ticket (#2709)
yhilmare Jun 7, 2024
4500e6c
fix(dlm): the task status does not update properly when structural sy…
guowl3 Jun 7, 2024
b7b9f0e
response comments
guowl3 Jun 7, 2024
4d3f9c2
response comments
guowl3 Jun 7, 2024
6780773
update changelog
guowl3 Jun 7, 2024
68dccc9
update changelog
guowl3 Jun 7, 2024
9e7a1e7
docs: change log for v4.3.0 #2675
yizhouxw Jun 7, 2024
abb7b02
refactor(security): add configurable security whitelists (#2714)
ungreat Jun 7, 2024
36b1343
fix(dlm): upgrade dlm sdk to 1.1.4 (#2697)
guowl3 Jun 7, 2024
03a9c1c
fix(ticket): failed to view all tickets (#2716)
yhilmare Jun 7, 2024
f1a00d6
refactor(schedule): add without permission method (#2670)
ungreat Jun 7, 2024
6c60dd2
fix(multiple database): change the method when initiating child ticke…
zijiacj Jun 11, 2024
2591a0e
fix(structure-comparison): get a wrong result when comparing two same…
yhilmare Jun 11, 2024
e3fa536
fix(schedule): terminate if schedule is invalid (#2725)
guowl3 Jun 11, 2024
7afa242
builds: update submodule (#2730)
yhilmare Jun 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@
/server/integration-test/ @smallsheeeep @yhilmare @yizhouxw
/server/test-script/ @smallsheeeep @yhilmare @yizhouxw

# i18n
/server/odc-core/src/main/resources/i18n/ @Jane201510 @JessieWuJiexi @yizhouxw

# docs
/docs/ @Jane201510 @yhilmare @yizhouxw
Expand Down
59 changes: 45 additions & 14 deletions .github/workflows/build_artifact.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# 1. Manual trigger
# Jobs:
# 1. Calculate Version Number
# 2. Build Web Artifact (include front resource and only x86_64 platform for now)
# 2. Build Web Artifact
# 3. Build Client Artifact
###

Expand Down Expand Up @@ -67,7 +67,7 @@ jobs:
odc_docker_image_tag: ${{ steps.calculate_version.outputs.odc_docker_image_tag }}
steps:
- name: Checkout workspace
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Calculate version number
id: calculate_version
run: |
Expand All @@ -82,6 +82,37 @@ jobs:
echo "odc_docker_image_tag=${odc_docker_image_tag}" >> $GITHUB_OUTPUT
echo "odc_docker_image_tag=${odc_docker_image_tag}"

build-web-arm64:
name: Build Web Artifact (ARM64)
needs: [ calculate-version ]
runs-on: ubuntu-latest
env:
odc_rpm_release_number: ${{ needs.calculate-version.outputs.odc_rpm_release_number }}
odc_docker_image_tag: ${{ needs.calculate-version.outputs.odc_docker_image_tag }}
steps:
- name: Checkout workspace
uses: actions/checkout@v4
- name: Setup JDK 8
uses: actions/setup-java@v4
with:
java-version: "8"
distribution: "temurin"
cache: maven
- name: action by obfarm++odc_build_arm++BUILD_DOCKER_IMAGE=1;BUILD_RPM=1;BUILD_RPM_VERSION=${{ inputs.rpm_release }};BUILD_DOCKER_TAG=${{ env.odc_docker_image_tag }}
if: ${{ github.event.inputs.build_rpm == 'true' || github.event.inputs.build_docker == 'true' }}
uses: ./.github/obfarm/
id: build-web-arm64
with:
pipeline_id: ${{ github.run_id }}
project: ${{ github.repository }}
- name: Echo build result
if: ${{ github.event.inputs.build_rpm == 'true' || github.event.inputs.build_docker == 'true' }}
run: |
main_version="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d - -f 1)"
new_version="${main_version}-${odc_rpm_release_number}"
echo "::notice ::BUILD RPM DOWNLOAD URL https://farm-use-for-odc.obs.cn-east-3.myhuaweicloud.com/odc-rpm/$GITHUB_RUN_ID/odc-server-${new_version}.aarch64.rpm"
echo "::notice ::BUILD DOCKER IMAGE DOWNLOAD URL https://farm-use-for-odc.obs.cn-east-3.myhuaweicloud.com/odc-image/$GITHUB_RUN_ID/odc-${{ env.odc_docker_image_tag }}-arm64.tar.gz"

build-web-x86_64:
name: Build Web Artifact (x86_64)
needs: [ calculate-version ]
Expand All @@ -91,17 +122,17 @@ jobs:
odc_docker_image_tag: ${{ needs.calculate-version.outputs.odc_docker_image_tag }}
steps:
- name: Checkout workspace
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: "recursive"
- name: Setup JDK 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "8"
distribution: "temurin"
cache: maven
- name: Setup node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
- name: Build front static resources
Expand Down Expand Up @@ -172,7 +203,7 @@ jobs:
zip -d distribution/jar/odc-slim.jar "BOOT-INF/classes/static/*"
- name: Upload jar
if: ${{ github.event.inputs.build_jar == 'true' || github.event.inputs.build_client == 'true'}}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: odc-artifact-jar
path: |
Expand All @@ -190,7 +221,7 @@ jobs:
mv --verbose server/odc-server/target/rpm/odc-server/RPMS/*/odc-*.rpm distribution/docker/resources/
- name: Upload rpm (x86_64)
if: ${{ github.event.inputs.build_rpm == 'true' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: odc-server-${{ steps.set_release_version.outputs.new_version }}.x86_64.rpm
path: distribution/docker/resources/odc-*.rpm
Expand All @@ -205,7 +236,7 @@ jobs:
popd
- name: Upload docker image (x86_64)
if: ${{ github.event.inputs.build_docker == 'true' }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: odc-${{ env.odc_docker_image_tag }}.tar.gz
path: distribution/docker/resources/odc-*.tar.gz
Expand All @@ -221,12 +252,12 @@ jobs:
target: [ win, mac, linux_x86, linux_aarch64 ]
steps:
- name: Checkout workspace
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: "recursive"
# Build jar failed when run on macos-latest, so we need to build and upload jar on ubuntu-latest in the above job
- name: Download resources
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: odc-artifact-jar
path: jar-dist
Expand All @@ -239,19 +270,19 @@ jobs:
mkdir -p client/libraries/java/starters
cp -R jar-dist/starters/. client/libraries/java/starters
- name: Setup node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
- name: Install dependencies
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
run_install: false
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down Expand Up @@ -293,7 +324,7 @@ jobs:
export CSC_IDENTITY_AUTO_DISCOVERY=false
node ./scripts/client/build.js ${{ matrix.target }}
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: odc-client-pkg-${{ matrix.target }}
path: |
Expand Down
65 changes: 47 additions & 18 deletions .github/workflows/build_daily.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# 1. Check Code Format
# 2. PMD Scan
# 3. Calculate Version Number
# 4. Build Web Artifact (include front resource and only x86_64 platform for now)
# 4. Build Web Artifact
# 5. Build Client Artifact
###

Expand Down Expand Up @@ -39,9 +39,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout workspace
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "8"
distribution: "temurin"
Expand All @@ -56,9 +56,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout workspace
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Setup JDK 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "8"
distribution: "temurin"
Expand Down Expand Up @@ -93,7 +93,7 @@ jobs:
odc_docker_image_tag: ${{ steps.calculate_version.outputs.odc_docker_image_tag }}
steps:
- name: Checkout workspace
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Calculate version number
id: calculate_version
run: |
Expand All @@ -108,6 +108,35 @@ jobs:
echo "odc_docker_image_tag=${odc_docker_image_tag}" >> $GITHUB_OUTPUT
echo "odc_docker_image_tag=${odc_docker_image_tag}"

build-web-arm64:
name: Build Web Artifact (ARM64)
needs: [ calculate-version ]
runs-on: ubuntu-latest
env:
odc_rpm_release_number: ${{ needs.calculate-version.outputs.odc_rpm_release_number }}
odc_docker_image_tag: ${{ needs.calculate-version.outputs.odc_docker_image_tag }}
steps:
- name: Checkout workspace
uses: actions/checkout@v4
- name: Setup JDK 8
uses: actions/setup-java@v4
with:
java-version: "8"
distribution: "temurin"
cache: maven
- name: action by obfarm++odc_build_arm++BUILD_DOCKER_IMAGE=1;BUILD_RPM=1;BUILD_RPM_VERSION=${{ inputs.rpm_release }};BUILD_DOCKER_TAG=${{ env.odc_docker_image_tag }}
uses: ./.github/obfarm/
id: build-web-arm64
with:
pipeline_id: ${{ github.run_id }}
project: ${{ github.repository }}
- name: Echo Build Result
run: |
main_version="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | cut -d - -f 1)"
new_version="${main_version}-${odc_rpm_release_number}"
echo "::notice ::BUILD RPM DOWNLOAD URL https://farm-use-for-odc.obs.cn-east-3.myhuaweicloud.com/odc-rpm/$GITHUB_RUN_ID/odc-server-${new_version}.aarch64.rpm"
echo "::notice ::BUILD DOCKER IMAGE DOWNLOAD URL https://farm-use-for-odc.obs.cn-east-3.myhuaweicloud.com/odc-image/$GITHUB_RUN_ID/odc-${{ env.odc_docker_image_tag }}-arm64.tar.gz"

build-web-x86_64:
name: Build Web Artifact (x86_64)
needs: [ calculate-version ]
Expand All @@ -117,17 +146,17 @@ jobs:
odc_docker_image_tag: ${{ needs.calculate-version.outputs.odc_docker_image_tag }}
steps:
- name: Checkout workspace
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: "recursive"
- name: Setup JDK 8
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "8"
distribution: "temurin"
cache: maven
- name: Setup node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
- name: Build front static resources
Expand Down Expand Up @@ -197,15 +226,15 @@ jobs:
cp -fv distribution/jar/odc.jar distribution/jar/odc-slim.jar
zip -d distribution/jar/odc-slim.jar "BOOT-INF/classes/static/*"
- name: Upload jar
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: odc-artifact-jar
path: |
distribution/plugins/*.jar
distribution/starters/*.jar
distribution/jar/*.jar
- name: Upload rpm (x86_64)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: odc-server-${{ steps.set_release_version.outputs.new_version }}.x86_64.rpm
path: distribution/docker/resources/odc-*.rpm
Expand All @@ -218,7 +247,7 @@ jobs:
docker save -o resources/odc-${odc_docker_image_tag}.tar.gz docker.io/oceanbase/odc:${odc_docker_image_tag}
popd
- name: Upload docker image (x86_64)
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: odc-${{ env.odc_docker_image_tag }}.tar.gz
path: distribution/docker/resources/odc-*.tar.gz
Expand All @@ -233,11 +262,11 @@ jobs:
target: [ win, mac, linux_x86, linux_aarch64 ]
steps:
- name: Checkout workspace
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: "recursive"
- name: Download resources
uses: actions/download-artifact@v3
uses: actions/download-artifact@v4
with:
name: odc-artifact-jar
path: jar-dist
Expand All @@ -250,19 +279,19 @@ jobs:
mkdir -p client/libraries/java/starters
cp -R jar-dist/starters/. client/libraries/java/starters
- name: Setup node 16
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: "16"
- name: Install dependencies
uses: pnpm/action-setup@v2
uses: pnpm/action-setup@v4
with:
version: 8
run_install: false
- name: Get pnpm store directory
shell: bash
run: |
echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
- uses: actions/cache@v3
- uses: actions/cache@v4
name: Setup pnpm cache
with:
path: ${{ env.STORE_PATH }}
Expand Down Expand Up @@ -304,7 +333,7 @@ jobs:
export CSC_IDENTITY_AUTO_DISCOVERY=false
node ./scripts/client/build.js ${{ matrix.target }}
- name: Upload artifact
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: odc-client-pkg-${{ matrix.target }}
path: |
Expand Down
Loading
Loading