From c32ba7bb55edd75eb82bb429069de9c42b8b4431 Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Wed, 10 May 2023 10:24:01 +0200 Subject: [PATCH] Safe filenames --- .github/workflows/platform_natives.yaml | 22 +++++++++---------- .../scripts/{build-api.sh => build_api.sh} | 0 ...-ssl3.sh => build_archlinux_amd64_ssl3.sh} | 4 ++-- ...md64-ssl1.sh => build_linux_amd64_ssl1.sh} | 4 ++-- ...md64-ssl3.sh => build_linux_amd64_ssl3.sh} | 4 ++-- ...rm64-ssl1.sh => build_linux_arm64_ssl1.sh} | 6 ++--- ...l1.sh => install_deps_linux_arm64_ssl1.sh} | 0 .github/workflows/tdapi_file.yaml | 2 +- ...hain-arm64.cmake => toolchain_arm64.cmake} | 0 9 files changed, 21 insertions(+), 21 deletions(-) rename .github/workflows/scripts/{build-api.sh => build_api.sh} (100%) rename .github/workflows/scripts/{build-archlinux-amd64-ssl3.sh => build_archlinux_amd64_ssl3.sh} (96%) rename .github/workflows/scripts/{build-linux-amd64-ssl1.sh => build_linux_amd64_ssl1.sh} (98%) rename .github/workflows/scripts/{build-linux-amd64-ssl3.sh => build_linux_amd64_ssl3.sh} (98%) rename .github/workflows/scripts/{build-linux-arm64-ssl1.sh => build_linux_arm64_ssl1.sh} (98%) rename .github/workflows/scripts/{install-deps-linux-arm64-ssl1.sh => install_deps_linux_arm64_ssl1.sh} (100%) rename .github/workflows/toolchains/{toolchain-arm64.cmake => toolchain_arm64.cmake} (100%) diff --git a/.github/workflows/platform_natives.yaml b/.github/workflows/platform_natives.yaml index 34cc925..144ffbb 100644 --- a/.github/workflows/platform_natives.yaml +++ b/.github/workflows/platform_natives.yaml @@ -15,13 +15,13 @@ jobs: include: # todo: re-enable #- { os: ubuntu-20.04, type: "linux-386-ssl1" } - - { os: ubuntu-20.04, type: "linux-amd64-ssl1" } - - { os: ubuntu-20.04, type: "linux-arm64-ssl1" } + - { os: ubuntu-20.04, type: "linux_amd64_ssl1" } + - { os: ubuntu-20.04, type: "linux_arm64_ssl1" } #- { os: ubuntu-20.04, type: "linux-s390x-ssl1" } #- { os: ubuntu-20.04, type: "linux-ppc64le-ssl1" } - - { os: ubuntu-22.04, type: "linux-amd64-ssl3" } - #- { os: ubuntu-22.04, type: "linux-arm64-ssl3" } - #- { os: windows-2019, type: "windows-amd64", vcpkgCommitId: "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", triplet: "x64-windows-static" } + - { os: ubuntu-22.04, type: "linux_amd64_ssl3" } + #- { os: ubuntu-22.04, type: "linux_arm64_ssl3" } + #- { os: windows-2019, type: "windows_amd64", vcpkgCommitId: "6ca56aeb457f033d344a7106cb3f9f1abf8f4e98", triplet: "x64-windows-static" } #- { os: macos-12, type: "macos-amd64" } steps: - name: Checkout current repo @@ -47,7 +47,7 @@ jobs: HASH_VERSION=$(echo "$HASH_VERSION" | awk '{print tolower($0)}') VERSION=$(echo "$VERSION" | awk '{print tolower($0)}') TYPE=${{ matrix.type }} - SAFE_TYPE=${TYPE///} # linux-amd64 -> linux-amd64 + SAFE_TYPE=${TYPE///} # linux_amd64_ -> linux_amd64_ REVISION=4.0.${{ github.run_number }} GH_MATRIX_OS=${{ matrix.os }} @@ -119,8 +119,8 @@ jobs: set -xeo pipefail echo "REVISION: $REVISION" - if [[ -f "./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh" ]]; then - sudo ./.github/workflows/scripts/install-deps-${SAFE_TYPE}.sh + if [[ -f "./.github/workflows/scripts/install_deps_${SAFE_TYPE}.sh" ]]; then + sudo ./.github/workflows/scripts/install_deps_${SAFE_TYPE}.sh fi - name: Install ubuntu 20.04 dependencies if: matrix.os == 'ubuntu-20.04' @@ -177,7 +177,7 @@ jobs: set -xeo pipefail echo "REVISION: $REVISION" - source ./.github/workflows/scripts/build-${SAFE_TYPE}.sh + source ./.github/workflows/scripts/build_${SAFE_TYPE}.sh - uses: actions/upload-artifact@v3 with: name: tdlight-natives-${{env.REVISION}}-${{env.TYPE}}.jar @@ -201,7 +201,7 @@ jobs: -Drevision=$REVISION \ -Dclassifier=$TYPE \ -Dnative.type.classifier="$TYPE" - if [[ "$TYPE" == "linux-amd64-ssl1" ]]; then + if [[ "$TYPE" == "linux_amd64_ssl1" ]]; then mvn -B org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv-snapshot \ -DrepositoryId=mchv-snapshot-distribution \ -Dfile=natives/.ci-friendly-pom.xml \ @@ -237,7 +237,7 @@ jobs: -Drevision=$REVISION \ -Dclassifier=$TYPE \ -Dnative.type.classifier="$TYPE" - if [[ "$TYPE" == "linux-amd64-ssl1" ]]; then + if [[ "$TYPE" == "linux_amd64_ssl1" ]]; then mvn -B org.apache.maven.plugins:maven-deploy-plugin:3.1.1:deploy-file -Durl=https://mvn.mchv.eu/repository/mchv \ -DrepositoryId=mchv-release-distribution \ -Dfile=natives/.ci-friendly-pom.xml \ diff --git a/.github/workflows/scripts/build-api.sh b/.github/workflows/scripts/build_api.sh similarity index 100% rename from .github/workflows/scripts/build-api.sh rename to .github/workflows/scripts/build_api.sh diff --git a/.github/workflows/scripts/build-archlinux-amd64-ssl3.sh b/.github/workflows/scripts/build_archlinux_amd64_ssl3.sh similarity index 96% rename from .github/workflows/scripts/build-archlinux-amd64-ssl3.sh rename to .github/workflows/scripts/build_archlinux_amd64_ssl3.sh index f08a6b3..746fe0d 100755 --- a/.github/workflows/scripts/build-archlinux-amd64-ssl3.sh +++ b/.github/workflows/scripts/build_archlinux_amd64_ssl3.sh @@ -66,5 +66,5 @@ cmake \ cmake --build . --target install --config Release "-j$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ -mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux-amd64-ssl3.so -mvn package -Dnative.type.classifier=linux-amd64-ssl3 -Drevision="$REVISION" +mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_amd64_ssl3.so +mvn package -Dnative.type.classifier=linux_amd64_ssl3 -Drevision="$REVISION" diff --git a/.github/workflows/scripts/build-linux-amd64-ssl1.sh b/.github/workflows/scripts/build_linux_amd64_ssl1.sh similarity index 98% rename from .github/workflows/scripts/build-linux-amd64-ssl1.sh rename to .github/workflows/scripts/build_linux_amd64_ssl1.sh index a1afabb..d7fadd3 100755 --- a/.github/workflows/scripts/build-linux-amd64-ssl1.sh +++ b/.github/workflows/scripts/build_linux_amd64_ssl1.sh @@ -88,5 +88,5 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI cmake --build . --target install --config Release "-j$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ -mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux-amd64-ssl1.so -mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux-amd64-ssl1 package +mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_amd64_ssl1.so +mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux_amd64_ssl1 package diff --git a/.github/workflows/scripts/build-linux-amd64-ssl3.sh b/.github/workflows/scripts/build_linux_amd64_ssl3.sh similarity index 98% rename from .github/workflows/scripts/build-linux-amd64-ssl3.sh rename to .github/workflows/scripts/build_linux_amd64_ssl3.sh index b38d30a..fe19181 100755 --- a/.github/workflows/scripts/build-linux-amd64-ssl3.sh +++ b/.github/workflows/scripts/build_linux_amd64_ssl3.sh @@ -88,5 +88,5 @@ CXXFLAGS="-stdlib=libc++" CC="$HOST_CMAKE_C_COMPILER" CXX="$HOST_CMAKE_CXX_COMPI cmake --build . --target install --config Release "-j$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ -mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux-amd64-ssl3.so -mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux-amd64-ssl3 package +mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_amd64_ssl3.so +mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux_amd64_ssl3 package diff --git a/.github/workflows/scripts/build-linux-arm64-ssl1.sh b/.github/workflows/scripts/build_linux_arm64_ssl1.sh similarity index 98% rename from .github/workflows/scripts/build-linux-arm64-ssl1.sh rename to .github/workflows/scripts/build_linux_arm64_ssl1.sh index 99138af..26eac58 100755 --- a/.github/workflows/scripts/build-linux-arm64-ssl1.sh +++ b/.github/workflows/scripts/build_linux_arm64_ssl1.sh @@ -1,7 +1,7 @@ #!/bin/bash -ex # Ubuntu 20.04 REVISION="${REVISION:-1.0.0.0-SNAPSHOT}" -TOOLCHAIN_FILE="$(readlink -e ./.github/workflows/toolchains/toolchain-arm64.cmake)" +TOOLCHAIN_FILE="$(readlink -e ./.github/workflows/toolchains/toolchain_arm64.cmake)" # Create missing dirs rm -rf implementations/tdlight/td_tools_build implementations/tdlight/build api/target-legacy api/target api/.ci-friendly-pom.xml implementations/tdlight/td/generate/auto natives/src/main/java/it/tdlight/jni natives/build natives/tdjni_bin natives/tdjni_docs @@ -80,5 +80,5 @@ cmake \ cmake --build . --target install --config Release "-j$(nproc)" cd .. mkdir -p src/main/resources/META-INF/tdlightjni/ -mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux-arm64-ssl1.so -mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux-arm64-ssl1 package +mv tdjni_bin/libtdjni.so src/main/resources/META-INF/tdlightjni/libtdjni.linux_arm64_ssl1.so +mvn -B -f pom.xml -Drevision="$REVISION" -Dnative.type.classifier=linux_arm64_ssl1 package diff --git a/.github/workflows/scripts/install-deps-linux-arm64-ssl1.sh b/.github/workflows/scripts/install_deps_linux_arm64_ssl1.sh similarity index 100% rename from .github/workflows/scripts/install-deps-linux-arm64-ssl1.sh rename to .github/workflows/scripts/install_deps_linux_arm64_ssl1.sh diff --git a/.github/workflows/tdapi_file.yaml b/.github/workflows/tdapi_file.yaml index c0f3adf..115992a 100644 --- a/.github/workflows/tdapi_file.yaml +++ b/.github/workflows/tdapi_file.yaml @@ -77,7 +77,7 @@ jobs: set -xeo pipefail echo "REVISION: $REVISION" - ./.github/workflows/scripts/build-api.sh + ./.github/workflows/scripts/build_api.sh - uses: actions/upload-artifact@v3 with: name: tdlight-api-${{env.REVISION}}.jar diff --git a/.github/workflows/toolchains/toolchain-arm64.cmake b/.github/workflows/toolchains/toolchain_arm64.cmake similarity index 100% rename from .github/workflows/toolchains/toolchain-arm64.cmake rename to .github/workflows/toolchains/toolchain_arm64.cmake