From 039fd98fb9503992593360b6d58ccd70de012bf4 Mon Sep 17 00:00:00 2001 From: Tobias de Bruijn Date: Mon, 6 Dec 2021 20:27:16 +0100 Subject: [PATCH] Fixed GLIBC incompatibility --- .github/workflows/release.yml | 276 ---------------------------------- Makefile | 6 +- gradle.properties | 2 +- 3 files changed, 4 insertions(+), 280 deletions(-) delete mode 100644 .github/workflows/release.yml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml deleted file mode 100644 index 13d0671..0000000 --- a/.github/workflows/release.yml +++ /dev/null @@ -1,276 +0,0 @@ -name: Release CI - -on: - push: - tags: - - '**' - -jobs: - build-linux-x86_64-xenial: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - # Docker - - name: Install dependencies for Docker - run: sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release make - - name: Docker GPG Key - run: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - - name: Docker APT repository - run: echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - - name: Install Docker - run: sudo apt-get update -y && sudo apt-get install -y docker-ce docker-ce-cli containerd.io - - # Build - - name: Build library - run: make lib/target/x86_64-unknown-linux-gnu/release/libskinfixer.so - - #Upload file - - name: 'Upload Artifact' - uses: actions/upload-artifact@v2 - with: - name: linux-x86_64-xenial.so - path: lib/target/x86_64-unknown-linux-gnu/release/libskinfixer.so - retention-days: 1 - - build-linux-x86_64-focal: - runs-on: ubuntu-20.04 - steps: - - uses: actions/checkout@v2 - - # Dependencies - - name: Install dependencies - run: sudo apt-get update && sudo apt-get install -y make gcc libssl-dev - - name: Install Rust - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - - name: Add Rust binaries to path - run: export PATH="$HOME/.cargo/bin:$PATH" - - name: Add target - run: rustup target add x86_64-unknown-linux-gnu - - # Build - - name: Build library - run: cd lib && cargo build --lib --release --target x86_64-unknown-linux-gnu - - #Upload file - - name: 'Upload Artifact' - uses: actions/upload-artifact@v2 - with: - name: linux-x86_64-focal.so - path: lib/target/x86_64-unknown-linux-gnu/release/libskinfixer.so - retention-days: 1 - - build-linux-aarch64: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - # Docker - - name: Install dependencies for Docker - run: sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release make - - name: Docker GPG Key - run: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - - name: Docker APT repository - run: echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - - name: Install Docker - run: sudo apt-get update -y && sudo apt-get install -y docker-ce docker-ce-cli containerd.io - - # Build - - name: Build library - run: make lib/target/aarch64-unknown-linux-gnu/release/libskinfixer.so - - # Upload file - - name: 'Upload Artifact' - uses: actions/upload-artifact@v2 - with: - name: linux-aarch64.so - path: lib/target/aarch64-unknown-linux-gnu/release/libskinfixer.so - retention-days: 1 - - build-linux-armhf: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - # Docker - - name: Install dependencies for Docker - run: sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release make - - name: Docker GPG Key - run: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - - name: Docker APT repository - run: echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - - name: Install Docker - run: sudo apt-get update -y && sudo apt-get install -y docker-ce docker-ce-cli containerd.io - - # Build - - name: Build library - run: make lib/target/arm-unknown-linux-gnueabihf/release/libskinfixer.so - - # Upload file - - name: 'Upload Artifact' - uses: actions/upload-artifact@v2 - with: - name: linux-armhf.so - path: lib/target/arm-unknown-linux-gnueabihf/release/libskinfixer.so - retention-days: 1 - - build-windows-x86_64: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - # Dependencies - - name: Install dependencies - run: sudo apt-get update && sudo apt-get install -y make gcc libssl-dev gcc-mingw-w64-x86-64 - - name: Install Rust - run: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y - - name: Add Rust binaries to path - run: export PATH="$HOME/.cargo/bin:$PATH" - - name: Add windows target - run: rustup target add x86_64-pc-windows-gnu - - # Build - - name: Build library - run: make lib/target/x86_64-pc-windows-gnu/release/libskinfixer.dll - - # Upload file - - name: 'Upload Artifact' - uses: actions/upload-artifact@v2 - with: - name: windows-x86_64.dll - path: lib/target/x86_64-pc-windows-gnu/release/libskinfixer.dll - retention-days: 1 - - build-apple-darwin-x86_64: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - # Docker - - name: Install dependencies for Docker - run: sudo apt-get update && sudo apt-get install -y apt-transport-https ca-certificates curl gnupg lsb-release make - - name: Docker GPG Key - run: curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg - - name: Docker APT repository - run: echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null - - name: Install Docker - run: sudo apt-get update -y && sudo apt-get install -y docker-ce docker-ce-cli containerd.io - - # Build - - name: Build library - run: make lib/target/x86_64-apple-darwin/release/libskinfixer.dylib - - #Upload file - - name: 'Upload Artifact' - uses: actions/upload-artifact@v2 - with: - name: darwin-x86_64.dylib - path: lib/target/x86_64-apple-darwin/release/libskinfixer.dylib - retention-days: 1 - - build-jar: - runs-on: ubuntu-latest - needs: - - build-linux-x86_64-xenial - - build-linux-x86_64-focal - - build-linux-aarch64 - - build-linux-armhf - - build-windows-x86_64 - - build-apple-darwin-x86_64 - steps: - - uses: actions/checkout@v2 - - # Dependencies - - name: Set up Java 16 - uses: actions/setup-java@v1 - with: - java-version: 1.16 - - name: Make - run: sudo apt-get install -y make - - #Download artifacts - - name: Download Linux x86_64 Xenial artifact - uses: actions/download-artifact@v2 - with: - name: linux-x86_64-xenial.so - path: lib/target/x86_64-unknown-linux-gnu/release/ - - name: Rename artifact - run: mv lib/target/x86_64-unknown-linux-gnu/release/libskinfixer.so lib/target/x86_64-unknown-linux-gnu/release/libskinfixer-xenial.so - - - name: Download Linux x86_64 Focal artifact - uses: actions/download-artifact@v2 - with: - name: linux-x86_64-focal.so - path: lib/target/x86_64-unknown-linux-gnu/release/ - #- name: Rename artifact - # run: mv lib/target/x86_64-unknown-linux/release/linux-x86_64-focal.so lib/target/x86_64-unknown-linux/release/libskinfixer.so - - - name: Download Linux aarch64 artifact - uses: actions/download-artifact@v2 - with: - name: linux-aarch64.so - path: lib/target/aarch64-unknown-linux/release/ - #- name: Rename artifact - # run: mv lib/target/aarch64-unknown-linux/release/linux-aarch64.so lib/target/aarch64-unknown-linux/release/libskinfixer.so - - - name: Download Linux armhf artifact - uses: actions/download-artifact@v2 - with: - name: linux-armhf.so - path: lib/target/arm-unknown-linux-gnueabihf/release/ - #- name: Rename artifact - # run: mv lib/target/arm-unknown-linux-gnueabihf/release/linux-x86_64.so lib/target/arm-unknown-linux-gnueabihf/release/libskinfixer.so - - - name: Download Windows x86_64 artifact - uses: actions/download-artifact@v2 - with: - name: windows-x86_64.dll - path: lib/target/x86_64-pc-windows-gnu/release/ - #- name: Rename artifact - # run: mv lib/target/x86_64-pc-windows-gnu/release/windows-x86_64.dll lib/target/x86_64-pc-windows-gnu/release/libskinfixer.dll - - - name: Download Apple Darwin x86_64 artifact - uses: actions/download-artifact@v2 - with: - name: darwin-x86_64.dylib - path: lib/target/x86_64-apple-darwin/release/ - #- name: Rename artifact - # run: mv lib/target/x86_64-apple-darwin/release/darwin-x86_64.dylib lib/target/x86_64-apple-darwin/release/libskinfixer.dylib - - # Build JAR - - name: Gradlew permissions - run: chmod +x gradlew - - name: Build with Gradle - run: ./gradlew releasejar - - # Create release - #Extract version number - - name: Extract version number - run: echo "RELEASE_VERSION=${GITHUB_REF#refs/*/}" >> $GITHUB_ENV - #Extract repository name - - name: Extract repository name - run: echo "REPOSITORY_NAME=$(echo "$GITHUB_REPOSITORY" | awk -F / '{print $2}' | sed -e "s/:refs//")" >> $GITHUB_ENV - - #Create a release - - name: Create Release - id: create_release - uses: actions/create-release@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - tag_name: ${{ github.ref }} - release_name: Release ${{ github.ref }} - draft: false - prerelease: false - - #Attach compiled JAR to Releases - - name: Attach JAR to Release - id: upload_release_asset - uses: actions/upload-release-asset@v1 - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - with: - upload_url: ${{ steps.create_release.outputs.upload_url }} - asset_path: releases/SkinFixer-${{ env.RELEASE_VERSION }}-RELEASE.jar - asset_name: ${{ env.REPOSITORY_NAME }}-${{ env.RELEASE_VERSION }}-RELEASE.jar - asset_content_type: application/java-archive \ No newline at end of file diff --git a/Makefile b/Makefile index 02faee6..1993574 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ RUST_SOURCE_FILES := $(shell find lib/src -type f) # Release - Linux x86_64 Xenial lib/target/x86_64-unknown-linux-gnu/release/libskinfixer.so: ${RUST_SOURCE_FILES} mkdir -p lib/target/x86_64-unknown-linux-gnu/release - docker run -v "${CURDIR}/lib/:/code/" docker-registry.k8s.array21.dev/rust-amd64-centos7 release + docker run -v "${CURDIR}/lib/:/code/" docker-registry.k8s.array21.dev/rust-amd64-xenial release # Release - Linux aarch64 lib/target/aarch64-unknown-linux-gnu/release/libskinfixer.so: ${RUST_SOURCE_FILES} @@ -34,7 +34,7 @@ lib/target/x86_64-apple-darwin/release/libskinfixer.dylib: ${RUST_SOURCE_FILES} # Debug - Linux x86_64 lib/target/x86_64-unknown-linux-gnu/debug/libskinfixer.so: ${RUST_SOURCE_FILES} - docker run -v "${CURDIR}/lib/:/code/" docker-registry.k8s.array21.dev/rust-amd64-centos7 + docker run -v "${CURDIR}/lib/:/code/" docker-registry.k8s.array21.dev/rust-amd64-xenial # Debug - Linux aarch64 lib/target/aarch64-unknown-linux-gnu/debug/libskinfixer.so: ${RUST_SOURCE_FILES} @@ -66,4 +66,4 @@ releasejar: lib/target/x86_64-unknown-linux-gnu/release/libskinfixer.so lib/targ ./gradlew releasejar clean: - sudo rm -rf build lib/target \ No newline at end of file + sudo rm -rf build lib/target diff --git a/gradle.properties b/gradle.properties index e03d3c1..80a3c94 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -pluginVersion = 1.7.3 \ No newline at end of file +pluginVersion = 1.7.4