diff --git a/.circleci/config.yml b/.circleci/config.yml index 959e66cd..3ff1dd24 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -179,21 +179,7 @@ jobs: - store_artifacts: path: /distrib - # ------------------------------------- - # publish artifact on github - # ------------------------------------- - github_release: - <<: *defaults - - steps: - - attach_workspace: - at: / - - run: apt-get update; DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends ca-certificates golang git - - run: go get github.com/tcnksm/ghr - - deploy: - name: "Deploy to Github" - command: $HOME/go/bin/ghr -t $GITHUB_TOKEN -u $CIRCLE_PROJECT_USERNAME -r $CIRCLE_PROJECT_REPONAME $CIRCLE_TAG /distrib - + workflows: version: 2 build: @@ -247,12 +233,4 @@ workflows: filters: tags: only: /.*/ - - github_release: - requires: - - store_artifact - filters: - branches: - ignore: /.*/ - tags: - only: /.*/ \ No newline at end of file diff --git a/.github/workflows/cpp-cross-linux-rpi.yml b/.github/workflows/cpp-cross-linux-rpi.yml index 78fe4bb9..dbd7d634 100644 --- a/.github/workflows/cpp-cross-linux-rpi.yml +++ b/.github/workflows/cpp-cross-linux-rpi.yml @@ -1,4 +1,4 @@ -name: C/C++ CI linux cross armv6 +name: C/C++ CI linux cross armv6/armv7 on: [push] @@ -6,6 +6,7 @@ jobs: build: strategy: matrix: + include: - buildtype: Debug arch: armv6l crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%201%2C%20Zero/cross-gcc-10.2.0-pi_0-1.tar.gz @@ -13,9 +14,11 @@ jobs: arch: armv6l crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%201%2C%20Zero/cross-gcc-10.2.0-pi_0-1.tar.gz - buildtype: Debug - arch: armv7 + arch: armv7l crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%202%2C%203/cross-gcc-10.2.0-pi_2-3.tar.gz - + - buildtype: Release + arch: armv7l + crosscompiler: https://sourceforge.net/projects/raspberry-pi-cross-compilers/files/Raspberry%20Pi%20GCC%20Cross-Compiler%20Toolchains/Buster/GCC%2010.2.0/Raspberry%20Pi%202%2C%203/cross-gcc-10.2.0-pi_2-3.tar.gz runs-on: ubuntu-latest diff --git a/Dockerfile b/Dockerfile index 4744560e..3c914046 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # build -FROM ubuntu:24.04 as builder +FROM ubuntu:24.04 AS builder LABEL maintainer=michel.promonet@free.fr ARG USERNAME=dev WORKDIR /webrtc-streamer diff --git a/Dockerfile.arm64 b/Dockerfile.arm64 index 1f9b76d9..15e6cc32 100644 --- a/Dockerfile.arm64 +++ b/Dockerfile.arm64 @@ -1,7 +1,7 @@ ARG IMAGE=arm64v8/ubuntu # build -FROM ubuntu:24.04 as builder +FROM ubuntu:24.04 AS builder LABEL maintainer=michel.promonet@free.fr WORKDIR /webrtc-streamer diff --git a/Dockerfile.rpi b/Dockerfile.rpi index 3920cfac..422dc031 100644 --- a/Dockerfile.rpi +++ b/Dockerfile.rpi @@ -1,7 +1,7 @@ ARG IMAGE=balenalib/raspberry-pi # build -FROM ubuntu:24.04 as builder +FROM ubuntu:24.04 AS builder LABEL maintainer=michel.promonet@free.fr ARG ARCH=armv6l diff --git a/Dockerfile.windows b/Dockerfile.windows index 88fd81c3..b4002a3a 100644 --- a/Dockerfile.windows +++ b/Dockerfile.windows @@ -1,5 +1,5 @@ # build -FROM mcr.microsoft.com/dotnet/framework/sdk:4.8.1-windowsservercore-ltsc2022 as builder +FROM mcr.microsoft.com/dotnet/framework/sdk:4.8-windowsservercore-ltsc2019 AS builder LABEL maintainer=michel.promonet@free.fr WORKDIR /webrtc-streamer COPY . /webrtc-streamer