fix(ci): Make sure merge_local_staging handles all subdir #3788

Xuanwo · 2023-12-20T03:52:17Z

Fix #3787

Signed-off-by: Xuanwo <github@xuanwo.io>

scripts/merge_local_staging.py

Signed-off-by: Xuanwo <github@xuanwo.io>

scripts/merge_local_staging.py

Signed-off-by: Xuanwo <github@xuanwo.io>

tisonkun · 2023-12-20T04:23:52Z

In another perspective, the PR description doesn't tell why the preview script doesn't convey all the variants. I guess it's some override rather than append logic. But it's not easy to reverse engineer the patch to understand.

suyanhanx · 2023-12-20T04:29:08Z

😦May you test it by dry run?

tisonkun · 2023-12-20T04:31:05Z

May you test it by dry run?

I ever test the original script by download the final artifacts.

The workflow file already have a ${{ github.event_name != 'pull_request' }} in deploy step but missing a upload artifact for debugging.

But the artifacts for each platform are available so the python script can be tested locally.

Signed-off-by: Xuanwo <github@xuanwo.io>

Xuanwo · 2023-12-20T04:42:46Z

Tested locally with linux x86_64 & aarch artifacts:

> python ./merge_local_staging.py ./staging /tmp/linux-aarch_64-local-staging/staging /tmp/linux-x86_64-local-staging/staging
Target directory set to staging
Processing /tmp/linux-aarch_64-local-staging/staging
Appending /tmp/linux-aarch_64-local-staging/staging/16a16cf8585f60/.index to staging/16a16cf8585f60/.index
Copying /tmp/linux-aarch_64-local-staging/staging/16a16cf8585f60/org to staging/16a16cf8585f60
Processing /tmp/linux-x86_64-local-staging/staging
Appending /tmp/linux-x86_64-local-staging/staging/16a16cf8585f60/.index to staging/16a16cf8585f60/.index
Copying /tmp/linux-x86_64-local-staging/staging/16a16cf8585f60/org to staging/16a16cf8585f60

Signed-off-by: Xuanwo <github@xuanwo.io>

Xuanwo · 2023-12-20T04:44:08Z

Also added tree command to check if we merged correctly.

tisonkun · 2023-12-20T04:45:52Z

Tested locally with linux x86_64 & aarch artifacts:

Can you download the uploaded artifacts (linux, macos, window) and test the script on those artifacts?

Xuanwo · 2023-12-20T04:46:16Z

Can you download the uploaded artifacts (linux, macos, window) and test the script on those artifacts?

Yep. I tested it in this way.

tisonkun · 2023-12-20T04:46:59Z

@Xuanwo but you test only for linux aarch64 and x8664. Let's try for what exactly the script does to avoid some subtle issue.

Xuanwo · 2023-12-20T04:56:03Z

Tested on all artifacts downloaded from: https://github.com/apache/incubator-opendal/actions/runs/7046140331

:( python ./merge_local_staging.py ./staging /tmp/linux-aarch_64-local-staging/staging /tmp/linux-x86_64-local-staging/staging /tmp/windows-x86_64-local-staging/staging /tmp/osx-aarch_64-local-staging/staging /tmp/osx-x86_64-local-staging/staging 
Target directory set to staging
Processing /tmp/linux-aarch_64-local-staging/staging
Appending /tmp/linux-aarch_64-local-staging/staging/16a16cf8585f60/.index to staging/16a16cf8585f60/.index
Copying /tmp/linux-aarch_64-local-staging/staging/16a16cf8585f60/org to staging/16a16cf8585f60
Processing /tmp/linux-x86_64-local-staging/staging
Appending /tmp/linux-x86_64-local-staging/staging/16a16cf8585f60/.index to staging/16a16cf8585f60/.index
Copying /tmp/linux-x86_64-local-staging/staging/16a16cf8585f60/org to staging/16a16cf8585f60
Processing /tmp/windows-x86_64-local-staging/staging
Appending /tmp/windows-x86_64-local-staging/staging/16a16cf8585f60/.index to staging/16a16cf8585f60/.index
Copying /tmp/windows-x86_64-local-staging/staging/16a16cf8585f60/org to staging/16a16cf8585f60
Processing /tmp/osx-aarch_64-local-staging/staging
Appending /tmp/osx-aarch_64-local-staging/staging/16a16cf8585f60/.index to staging/16a16cf8585f60/.index
Copying /tmp/osx-aarch_64-local-staging/staging/16a16cf8585f60/org to staging/16a16cf8585f60
Processing /tmp/osx-x86_64-local-staging/staging
Appending /tmp/osx-x86_64-local-staging/staging/16a16cf8585f60/.index to staging/16a16cf8585f60/.index
Copying /tmp/osx-x86_64-local-staging/staging/16a16cf8585f60/org to staging/16a16cf8585f60

index file:

org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar=org.apache.opendal:opendal-java:0.43.0:n/a:jar:jar:opendal-java-0.43.0.pom:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip=org.apache.opendal:opendal-java:0.43.0:source-release:zip:zip:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar=org.apache.opendal:opendal-java:0.43.0:sources:java-source:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar=org.apache.opendal:opendal-java:0.43.0:javadoc:javadoc:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-linux-aarch_64.jar=org.apache.opendal:opendal-java:0.43.0:linux-aarch_64:jar:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.sha512=org.apache.opendal:opendal-java:0.43.0:source-release:zip.sha512:zip.sha512:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar.asc=org.apache.opendal:opendal-java:0.43.0:n/a:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.pom.asc=org.apache.opendal:opendal-java:0.43.0:n/a:pom.asc:pom.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.asc=org.apache.opendal:opendal-java:0.43.0:source-release:zip.asc:zip.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar.asc=org.apache.opendal:opendal-java:0.43.0:sources:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar.asc=org.apache.opendal:opendal-java:0.43.0:javadoc:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-linux-aarch_64.jar.asc=org.apache.opendal:opendal-java:0.43.0:linux-aarch_64:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar=org.apache.opendal:opendal-java:0.43.0:n/a:jar:jar:opendal-java-0.43.0.pom:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip=org.apache.opendal:opendal-java:0.43.0:source-release:zip:zip:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar=org.apache.opendal:opendal-java:0.43.0:sources:java-source:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar=org.apache.opendal:opendal-java:0.43.0:javadoc:javadoc:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-linux-x86_64.jar=org.apache.opendal:opendal-java:0.43.0:linux-x86_64:jar:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.sha512=org.apache.opendal:opendal-java:0.43.0:source-release:zip.sha512:zip.sha512:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar.asc=org.apache.opendal:opendal-java:0.43.0:n/a:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.pom.asc=org.apache.opendal:opendal-java:0.43.0:n/a:pom.asc:pom.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.asc=org.apache.opendal:opendal-java:0.43.0:source-release:zip.asc:zip.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar.asc=org.apache.opendal:opendal-java:0.43.0:sources:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar.asc=org.apache.opendal:opendal-java:0.43.0:javadoc:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-linux-x86_64.jar.asc=org.apache.opendal:opendal-java:0.43.0:linux-x86_64:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar=org.apache.opendal:opendal-java:0.43.0:n/a:jar:jar:opendal-java-0.43.0.pom:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip=org.apache.opendal:opendal-java:0.43.0:source-release:zip:zip:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar=org.apache.opendal:opendal-java:0.43.0:sources:java-source:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar=org.apache.opendal:opendal-java:0.43.0:javadoc:javadoc:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-windows-x86_64.jar=org.apache.opendal:opendal-java:0.43.0:windows-x86_64:jar:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.sha512=org.apache.opendal:opendal-java:0.43.0:source-release:zip.sha512:zip.sha512:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar.asc=org.apache.opendal:opendal-java:0.43.0:n/a:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.pom.asc=org.apache.opendal:opendal-java:0.43.0:n/a:pom.asc:pom.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.asc=org.apache.opendal:opendal-java:0.43.0:source-release:zip.asc:zip.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar.asc=org.apache.opendal:opendal-java:0.43.0:sources:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar.asc=org.apache.opendal:opendal-java:0.43.0:javadoc:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-windows-x86_64.jar.asc=org.apache.opendal:opendal-java:0.43.0:windows-x86_64:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar=org.apache.opendal:opendal-java:0.43.0:n/a:jar:jar:opendal-java-0.43.0.pom:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip=org.apache.opendal:opendal-java:0.43.0:source-release:zip:zip:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar=org.apache.opendal:opendal-java:0.43.0:sources:java-source:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar=org.apache.opendal:opendal-java:0.43.0:javadoc:javadoc:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-osx-aarch_64.jar=org.apache.opendal:opendal-java:0.43.0:osx-aarch_64:jar:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.sha512=org.apache.opendal:opendal-java:0.43.0:source-release:zip.sha512:zip.sha512:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar.asc=org.apache.opendal:opendal-java:0.43.0:n/a:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.pom.asc=org.apache.opendal:opendal-java:0.43.0:n/a:pom.asc:pom.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.asc=org.apache.opendal:opendal-java:0.43.0:source-release:zip.asc:zip.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar.asc=org.apache.opendal:opendal-java:0.43.0:sources:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar.asc=org.apache.opendal:opendal-java:0.43.0:javadoc:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-osx-aarch_64.jar.asc=org.apache.opendal:opendal-java:0.43.0:osx-aarch_64:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar=org.apache.opendal:opendal-java:0.43.0:n/a:jar:jar:opendal-java-0.43.0.pom:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip=org.apache.opendal:opendal-java:0.43.0:source-release:zip:zip:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar=org.apache.opendal:opendal-java:0.43.0:sources:java-source:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar=org.apache.opendal:opendal-java:0.43.0:javadoc:javadoc:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-osx-x86_64.jar=org.apache.opendal:opendal-java:0.43.0:osx-x86_64:jar:jar:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.sha512=org.apache.opendal:opendal-java:0.43.0:source-release:zip.sha512:zip.sha512:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.jar.asc=org.apache.opendal:opendal-java:0.43.0:n/a:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0.pom.asc=org.apache.opendal:opendal-java:0.43.0:n/a:pom.asc:pom.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-source-release.zip.asc=org.apache.opendal:opendal-java:0.43.0:source-release:zip.asc:zip.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-sources.jar.asc=org.apache.opendal:opendal-java:0.43.0:sources:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-javadoc.jar.asc=org.apache.opendal:opendal-java:0.43.0:javadoc:jar.asc:jar.asc:n/a:n/a:n/a:n/a
org/apache/opendal/opendal-java/0.43.0/opendal-java-0.43.0-osx-x86_64.jar.asc=org.apache.opendal:opendal-java:0.43.0:osx-x86_64:jar.asc:jar.asc:n/a:n/a:n/a:n/a

file tree:

./staging
└── 16a16cf8585f60
    ├── .index
    └── org
        └── apache
            └── opendal
                └── opendal-java
                    ├── 0.43.0
                    │   ├── opendal-java-0.43.0.jar
                    │   ├── opendal-java-0.43.0.jar.asc
                    │   ├── opendal-java-0.43.0-javadoc.jar
                    │   ├── opendal-java-0.43.0-javadoc.jar.asc
                    │   ├── opendal-java-0.43.0-linux-aarch_64.jar
                    │   ├── opendal-java-0.43.0-linux-aarch_64.jar.asc
                    │   ├── opendal-java-0.43.0-linux-x86_64.jar
                    │   ├── opendal-java-0.43.0-linux-x86_64.jar.asc
                    │   ├── opendal-java-0.43.0-osx-aarch_64.jar
                    │   ├── opendal-java-0.43.0-osx-aarch_64.jar.asc
                    │   ├── opendal-java-0.43.0-osx-x86_64.jar
                    │   ├── opendal-java-0.43.0-osx-x86_64.jar.asc
                    │   ├── opendal-java-0.43.0.pom
                    │   ├── opendal-java-0.43.0.pom.asc
                    │   ├── opendal-java-0.43.0-source-release.zip
                    │   ├── opendal-java-0.43.0-source-release.zip.asc
                    │   ├── opendal-java-0.43.0-source-release.zip.sha512
                    │   ├── opendal-java-0.43.0-sources.jar
                    │   ├── opendal-java-0.43.0-sources.jar.asc
                    │   ├── opendal-java-0.43.0-windows-x86_64.jar
                    │   └── opendal-java-0.43.0-windows-x86_64.jar.asc
                    └── maven-metadata-nexus.xml

7 directories, 23 files

Signed-off-by: Xuanwo <github@xuanwo.io>

tisonkun

LGTM

.github/workflows/release_java.yml

Signed-off-by: Xuanwo <github@xuanwo.io>

* fix(ci): Make sure merge_local_staging handles all subdir Signed-off-by: Xuanwo <github@xuanwo.io> * Add some logs Signed-off-by: Xuanwo <github@xuanwo.io> * address comments Signed-off-by: Xuanwo <github@xuanwo.io> * Add comments Signed-off-by: Xuanwo <github@xuanwo.io> * refactor Signed-off-by: Xuanwo <github@xuanwo.io> * Print tree after merging Signed-off-by: Xuanwo <github@xuanwo.io> * Add more log for merging Signed-off-by: Xuanwo <github@xuanwo.io> * polish Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io>

# This is the 1st commit message: feat: Add presign_stat_with support (apache#3778) * feat: Add presign_stat_with support Signed-off-by: Xuanwo <github@xuanwo.io> * Fix r2 Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> # This is the commit message apache#2: feat: Add project layout for ofs (apache#3779) Signed-off-by: Xuanwo <github@xuanwo.io> # This is the commit message apache#3: ci: Workaround ring 0.17 build issue, bring aarch64 and armv7l back (apache#3781) Signed-off-by: Xuanwo <github@xuanwo.io> # This is the commit message apache#4: refactor: Migrate gcs builder to config based (apache#3786) Signed-off-by: Xuanwo <github@xuanwo.io> # This is the commit message apache#5: fix(ci): Make sure merge_local_staging handles all subdir (apache#3788) * fix(ci): Make sure merge_local_staging handles all subdir Signed-off-by: Xuanwo <github@xuanwo.io> * Add some logs Signed-off-by: Xuanwo <github@xuanwo.io> * address comments Signed-off-by: Xuanwo <github@xuanwo.io> * Add comments Signed-off-by: Xuanwo <github@xuanwo.io> * refactor Signed-off-by: Xuanwo <github@xuanwo.io> * Print tree after merging Signed-off-by: Xuanwo <github@xuanwo.io> * Add more log for merging Signed-off-by: Xuanwo <github@xuanwo.io> * polish Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> # This is the commit message apache#6: feat(services): add upyun support # This is the commit message apache#7: feat: Add presign_stat_with support (apache#3778) * feat: Add presign_stat_with support Signed-off-by: Xuanwo <github@xuanwo.io> * Fix r2 Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> # This is the commit message apache#8: feat: Add project layout for ofs (apache#3779) Signed-off-by: Xuanwo <github@xuanwo.io> # This is the commit message apache#9: ci: Workaround ring 0.17 build issue, bring aarch64 and armv7l back (apache#3781) Signed-off-by: Xuanwo <github@xuanwo.io> # This is the commit message apache#10: refactor: Migrate gcs builder to config based (apache#3786) Signed-off-by: Xuanwo <github@xuanwo.io>

feat: Add presign_stat_with support (apache#3778) * feat: Add presign_stat_with support Signed-off-by: Xuanwo <github@xuanwo.io> * Fix r2 Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> feat: Add project layout for ofs (apache#3779) Signed-off-by: Xuanwo <github@xuanwo.io> ci: Workaround ring 0.17 build issue, bring aarch64 and armv7l back (apache#3781) Signed-off-by: Xuanwo <github@xuanwo.io> refactor: Migrate gcs builder to config based (apache#3786) Signed-off-by: Xuanwo <github@xuanwo.io> fix(ci): Make sure merge_local_staging handles all subdir (apache#3788) * fix(ci): Make sure merge_local_staging handles all subdir Signed-off-by: Xuanwo <github@xuanwo.io> * Add some logs Signed-off-by: Xuanwo <github@xuanwo.io> * address comments Signed-off-by: Xuanwo <github@xuanwo.io> * Add comments Signed-off-by: Xuanwo <github@xuanwo.io> * refactor Signed-off-by: Xuanwo <github@xuanwo.io> * Print tree after merging Signed-off-by: Xuanwo <github@xuanwo.io> * Add more log for merging Signed-off-by: Xuanwo <github@xuanwo.io> * polish Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> feat(services): add upyun support feat: Add presign_stat_with support (apache#3778) * feat: Add presign_stat_with support Signed-off-by: Xuanwo <github@xuanwo.io> * Fix r2 Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> feat: Add project layout for ofs (apache#3779) Signed-off-by: Xuanwo <github@xuanwo.io> ci: Workaround ring 0.17 build issue, bring aarch64 and armv7l back (apache#3781) Signed-off-by: Xuanwo <github@xuanwo.io> refactor: Migrate gcs builder to config based (apache#3786) Signed-off-by: Xuanwo <github@xuanwo.io> feat: Add presign_stat_with support (apache#3778) * feat: Add presign_stat_with support Signed-off-by: Xuanwo <github@xuanwo.io> * Fix r2 Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> feat: Add project layout for ofs (apache#3779) Signed-off-by: Xuanwo <github@xuanwo.io> ci: Workaround ring 0.17 build issue, bring aarch64 and armv7l back (apache#3781) Signed-off-by: Xuanwo <github@xuanwo.io> refactor: Migrate gcs builder to config based (apache#3786) Signed-off-by: Xuanwo <github@xuanwo.io> fix(ci): Make sure merge_local_staging handles all subdir (apache#3788) * fix(ci): Make sure merge_local_staging handles all subdir Signed-off-by: Xuanwo <github@xuanwo.io> * Add some logs Signed-off-by: Xuanwo <github@xuanwo.io> * address comments Signed-off-by: Xuanwo <github@xuanwo.io> * Add comments Signed-off-by: Xuanwo <github@xuanwo.io> * refactor Signed-off-by: Xuanwo <github@xuanwo.io> * Print tree after merging Signed-off-by: Xuanwo <github@xuanwo.io> * Add more log for merging Signed-off-by: Xuanwo <github@xuanwo.io> * polish Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> feat(services): add upyun support feat: Add presign_stat_with support (apache#3778) * feat: Add presign_stat_with support Signed-off-by: Xuanwo <github@xuanwo.io> * Fix r2 Signed-off-by: Xuanwo <github@xuanwo.io> --------- Signed-off-by: Xuanwo <github@xuanwo.io> feat: Add project layout for ofs (apache#3779) Signed-off-by: Xuanwo <github@xuanwo.io> ci: Workaround ring 0.17 build issue, bring aarch64 and armv7l back (apache#3781) Signed-off-by: Xuanwo <github@xuanwo.io> refactor: Migrate gcs builder to config based (apache#3786) Signed-off-by: Xuanwo <github@xuanwo.io>

fix(ci): Make sure merge_local_staging handles all subdir

7db8d1b

Signed-off-by: Xuanwo <github@xuanwo.io>

Xuanwo requested a review from PsiACE as a code owner December 20, 2023 03:52

Xuanwo requested review from tisonkun and suyanhanx December 20, 2023 03:52

github-actions bot added the releases-note/fix label Dec 20, 2023

Add some logs

9a5a80c

Signed-off-by: Xuanwo <github@xuanwo.io>

tisonkun reviewed Dec 20, 2023

View reviewed changes

scripts/merge_local_staging.py Outdated Show resolved Hide resolved

address comments

3f6fd3d

Signed-off-by: Xuanwo <github@xuanwo.io>

tisonkun reviewed Dec 20, 2023

View reviewed changes

scripts/merge_local_staging.py Outdated Show resolved Hide resolved

Add comments

ba0fe39

Signed-off-by: Xuanwo <github@xuanwo.io>

refactor

4b2b972

Signed-off-by: Xuanwo <github@xuanwo.io>

Print tree after merging

fe3beb7

Signed-off-by: Xuanwo <github@xuanwo.io>

Add more log for merging

a004cf9

Signed-off-by: Xuanwo <github@xuanwo.io>

tisonkun approved these changes Dec 20, 2023

View reviewed changes

.github/workflows/release_java.yml Outdated Show resolved Hide resolved

polish

a19b694

Signed-off-by: Xuanwo <github@xuanwo.io>

Xuanwo merged commit e3070e6 into main Dec 20, 2023
21 checks passed

Xuanwo deleted the fix-java-release branch December 20, 2023 05:32

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix(ci): Make sure merge_local_staging handles all subdir #3788

fix(ci): Make sure merge_local_staging handles all subdir #3788

Xuanwo commented Dec 20, 2023

tisonkun commented Dec 20, 2023

suyanhanx commented Dec 20, 2023

tisonkun commented Dec 20, 2023 •

edited

Xuanwo commented Dec 20, 2023

Xuanwo commented Dec 20, 2023

tisonkun commented Dec 20, 2023

Xuanwo commented Dec 20, 2023 •

edited

tisonkun commented Dec 20, 2023

Xuanwo commented Dec 20, 2023

tisonkun left a comment

fix(ci): Make sure merge_local_staging handles all subdir #3788

fix(ci): Make sure merge_local_staging handles all subdir #3788

Conversation

Xuanwo commented Dec 20, 2023

tisonkun commented Dec 20, 2023

suyanhanx commented Dec 20, 2023

tisonkun commented Dec 20, 2023 • edited

Xuanwo commented Dec 20, 2023

Xuanwo commented Dec 20, 2023

tisonkun commented Dec 20, 2023

Xuanwo commented Dec 20, 2023 • edited

tisonkun commented Dec 20, 2023

Xuanwo commented Dec 20, 2023

tisonkun left a comment

Choose a reason for hiding this comment

tisonkun commented Dec 20, 2023 •

edited

Xuanwo commented Dec 20, 2023 •

edited