From 3ec4ea2db20ef4a11347cd5134b86dca4bc4056d Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 21 Sep 2023 18:27:41 +0800 Subject: [PATCH 1/7] [_] build tests --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index e12c095ab..2e739f289 100644 --- a/Makefile +++ b/Makefile @@ -170,7 +170,8 @@ artifacts-linux: clean # Making artifacts mkdir -p dist CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=amd64 go build -v -o dist/yao-${VERSION}-dev-linux-amd64 - CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ go build -v -o dist/yao-${VERSION}-dev-linux-arm64 +# CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ go build -v -o dist/yao-${VERSION}-dev-linux-arm64 + CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=arm64 CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ go build -v -o dist/yao-${VERSION}-dev-linux-arm64 mkdir -p dist/release mv dist/yao-*-* dist/release/ From 6414b2ea673c45ad8b6f406b8eb6fe53d03ccae0 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 21 Sep 2023 19:44:10 +0800 Subject: [PATCH 2/7] [_] --- .github/workflows/build-linux.yml | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 5484e47ca..02ebb9609 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -23,6 +23,8 @@ jobs: sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf sudo apt-get install -y g++-aarch64-linux-gnu crossbuild-essential-arm64 + sudo apt-get install -y gcc-12-aarch64-linux-gnu + sudo apt-get install -y g++-12-aarch64-linux-gnu - name: Install coscmd run: sudo pip3 install coscmd diff --git a/Makefile b/Makefile index 2e739f289..0e7d878ab 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,7 @@ artifacts-linux: clean mkdir -p dist CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=amd64 go build -v -o dist/yao-${VERSION}-dev-linux-amd64 # CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ go build -v -o dist/yao-${VERSION}-dev-linux-arm64 - CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=arm64 CC=arm-linux-gnueabihf-gcc CXX=arm-linux-gnueabihf-g++ go build -v -o dist/yao-${VERSION}-dev-linux-arm64 + CGO_ENABLED=1 CGO_LDFLAGS="-static" LD_LIBRARY_PATH=/usr/lib/gcc-cross/aarch64-linux-gnu/12 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc-12 CXX=aarch64-linux-gnu-g++-12 go build -v -o dist/yao-${VERSION}-dev-linux-arm64 mkdir -p dist/release mv dist/yao-*-* dist/release/ From b33292930058a7a3fb085ba671175151ba6a5698 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 21 Sep 2023 19:58:19 +0800 Subject: [PATCH 3/7] [_] --- .github/workflows/build-linux.yml | 7 +++++++ Makefile | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 02ebb9609..837dabce4 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -18,6 +18,7 @@ jobs: steps: - name: Arm Build run: | + echo "deb http://mirrors.kernel.org/ubuntu mantic main universe" >> /etc/apt/sources.list sudo apt-get update sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev build-essential bison flex libssl-dev bc sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi @@ -25,6 +26,12 @@ jobs: sudo apt-get install -y g++-aarch64-linux-gnu crossbuild-essential-arm64 sudo apt-get install -y gcc-12-aarch64-linux-gnu sudo apt-get install -y g++-12-aarch64-linux-gnu + sudo apt-get install -y gcc-13-aarch64-linux-gnu + sudo apt-get install -y g++-13-aarch64-linux-gnu + + - name: Inspect Tools + run: | + ls -l /usr/lib/gcc-cross/aarch64-linux-gnu/ - name: Install coscmd run: sudo pip3 install coscmd diff --git a/Makefile b/Makefile index 0e7d878ab..99a6e4fff 100644 --- a/Makefile +++ b/Makefile @@ -171,7 +171,7 @@ artifacts-linux: clean mkdir -p dist CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=amd64 go build -v -o dist/yao-${VERSION}-dev-linux-amd64 # CGO_ENABLED=1 CGO_LDFLAGS="-static" GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc CXX=aarch64-linux-gnu-g++ go build -v -o dist/yao-${VERSION}-dev-linux-arm64 - CGO_ENABLED=1 CGO_LDFLAGS="-static" LD_LIBRARY_PATH=/usr/lib/gcc-cross/aarch64-linux-gnu/12 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc-12 CXX=aarch64-linux-gnu-g++-12 go build -v -o dist/yao-${VERSION}-dev-linux-arm64 + CGO_ENABLED=1 CGO_LDFLAGS="-static" LD_LIBRARY_PATH=/usr/lib/gcc-cross/aarch64-linux-gnu/13 GOOS=linux GOARCH=arm64 CC=aarch64-linux-gnu-gcc-13 CXX=aarch64-linux-gnu-g++-13 go build -v -o dist/yao-${VERSION}-dev-linux-arm64 mkdir -p dist/release mv dist/yao-*-* dist/release/ From 4b506a1654acc285a2711e346e1f65f2cb9b61e1 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 21 Sep 2023 20:10:18 +0800 Subject: [PATCH 4/7] [_] --- .github/workflows/build-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index 837dabce4..b28a6bd35 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Arm Build run: | - echo "deb http://mirrors.kernel.org/ubuntu mantic main universe" >> /etc/apt/sources.list + sudo echo "deb http://mirrors.kernel.org/ubuntu mantic main universe" >> /etc/apt/sources.list sudo apt-get update sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev build-essential bison flex libssl-dev bc sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi From 31de53c285dfda3c329024cc0908a3e5fe4ccab4 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 21 Sep 2023 20:14:00 +0800 Subject: [PATCH 5/7] [_] --- .github/workflows/build-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index b28a6bd35..a6369e5a9 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Arm Build run: | - sudo echo "deb http://mirrors.kernel.org/ubuntu mantic main universe" >> /etc/apt/sources.list + sudo sh -c 'echo "deb http://mirrors.kernel.org/ubuntu mantic main universe" >> /etc/apt/sources.list' sudo apt-get update sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev build-essential bison flex libssl-dev bc sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi From 2563380e37a7c4aada3b5999a1807fb4b8c06a0b Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 21 Sep 2023 20:20:55 +0800 Subject: [PATCH 6/7] [_] --- .github/workflows/build-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index a6369e5a9..e44816ba5 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -18,7 +18,7 @@ jobs: steps: - name: Arm Build run: | - sudo sh -c 'echo "deb http://mirrors.kernel.org/ubuntu mantic main universe" >> /etc/apt/sources.list' + sudo sh -c 'echo "deb http://cz.archive.ubuntu.com/ubuntu mantic main universe" >> /etc/apt/sources.list' sudo apt-get update sudo apt-get install -y libc6-armel-cross libc6-dev-armel-cross binutils-arm-linux-gnueabi libncurses5-dev build-essential bison flex libssl-dev bc sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi From d4695e76aed7a9806f71ce94214b519e7bc11a82 Mon Sep 17 00:00:00 2001 From: Max Date: Thu, 21 Sep 2023 20:34:58 +0800 Subject: [PATCH 7/7] [_] --- .github/workflows/build-linux.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/build-linux.yml b/.github/workflows/build-linux.yml index e44816ba5..7a949e884 100644 --- a/.github/workflows/build-linux.yml +++ b/.github/workflows/build-linux.yml @@ -24,8 +24,6 @@ jobs: sudo apt-get install -y gcc-arm-linux-gnueabi g++-arm-linux-gnueabi sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf sudo apt-get install -y g++-aarch64-linux-gnu crossbuild-essential-arm64 - sudo apt-get install -y gcc-12-aarch64-linux-gnu - sudo apt-get install -y g++-12-aarch64-linux-gnu sudo apt-get install -y gcc-13-aarch64-linux-gnu sudo apt-get install -y g++-13-aarch64-linux-gnu