From e0242e515d4476f903365f2abe827bb088027fd1 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 30 Oct 2024 11:58:54 +0100 Subject: [PATCH 01/13] ci workflow and docker files --- .gitea/workflows/ci.yaml | 30 +++++++++ docker/Dockerfile | 27 ++++++++ docker/Dockerfile_Runner | 100 ++++++++++++++++++++++++++++++ docker/README.md | 4 ++ docker/compile_fsbl/.gitignore | 1 - docker/compile_fsbl/Dockerfile | 15 ----- docker/compile_mission/Dockerfile | 26 -------- docker/compile_obsw/Dockerfile | 29 --------- 8 files changed, 161 insertions(+), 71 deletions(-) create mode 100644 .gitea/workflows/ci.yaml create mode 100644 docker/Dockerfile create mode 100644 docker/Dockerfile_Runner create mode 100644 docker/README.md delete mode 100644 docker/compile_fsbl/.gitignore delete mode 100644 docker/compile_fsbl/Dockerfile delete mode 100644 docker/compile_mission/Dockerfile delete mode 100644 docker/compile_obsw/Dockerfile diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml new file mode 100644 index 0000000..55eca75 --- /dev/null +++ b/.gitea/workflows/ci.yaml @@ -0,0 +1,30 @@ +name: ROMEO CI Builder +on: push + +jobs: + Build Code: + runs-on: romeo-builder + steps: + - name: Check out repository code + uses: actions/checkout@v4 + with: + token: ${{ secrets.ROMEO_BUILDFIX_TOKEN }} + submodules: 'recursive' + - name: Configure z7 + run: | + mkdir build_z7 + cd build_z7 + cmake -DCMAKE_TOOLCHAIN_FILE=../bsp_z7/cmake/arm-none-eabi.toolchain .. + - name: Build z7 + run: | + cd build_z7 + make -j8 + - name: Configure linux + run: | + mkdir build_linux + cd build_linux + cmake .. + - name: Build linux + run: | + cd build_linux + make -j8 diff --git a/docker/Dockerfile b/docker/Dockerfile new file mode 100644 index 0000000..17a6e65 --- /dev/null +++ b/docker/Dockerfile @@ -0,0 +1,27 @@ +FROM debian:12.7-slim + +# Install required packages +RUN apt-get update && apt-get upgrade --yes + +RUN DEBIAN_FRONTEND=noninteractive apt-get install --yes --no-install-recommends \ + git \ + ssh \ + make \ + cmake \ + gcc \ + libc6-dev \ + curl \ + ca-certificates \ + gcc-arm-none-eabi \ + libnewlib-arm-none-eabi \ + # remove for image size + && rm -rf /var/lib/apt/lists/* + +# Install Rustup and select the nightly toolchain +RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly && \ + . "$HOME/.cargo/env" && \ + rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu + + +# Add the Rust toolchain binaries to PATH +ENV PATH="/root/.cargo/bin:${PATH}" diff --git a/docker/Dockerfile_Runner b/docker/Dockerfile_Runner new file mode 100644 index 0000000..59696b0 --- /dev/null +++ b/docker/Dockerfile_Runner @@ -0,0 +1,100 @@ +from romeo_builder + +RUN groupadd --gid 1000 node \ + && useradd --uid 1000 --gid node --shell /bin/bash --create-home node + +ENV NODE_VERSION 20.18.0 + +RUN ARCH= OPENSSL_ARCH= && dpkgArch="$(dpkg --print-architecture)" \ + && case "${dpkgArch##*-}" in \ + amd64) ARCH='x64' OPENSSL_ARCH='linux-x86_64';; \ + ppc64el) ARCH='ppc64le' OPENSSL_ARCH='linux-ppc64le';; \ + s390x) ARCH='s390x' OPENSSL_ARCH='linux*-s390x';; \ + arm64) ARCH='arm64' OPENSSL_ARCH='linux-aarch64';; \ + armhf) ARCH='armv7l' OPENSSL_ARCH='linux-armv4';; \ + i386) ARCH='x86' OPENSSL_ARCH='linux-elf';; \ + *) echo "unsupported architecture"; exit 1 ;; \ + esac \ + && set -ex \ + # libatomic1 for arm + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr xz-utils libatomic1 --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + # gpg keys listed at https://github.com/nodejs/node#release-keys + && for key in \ + 4ED778F539E3634C779C87C6D7062848A1AB005C \ + 141F07595B7B3FFE74309A937405533BE57C7D57 \ + 74F12602B6F1C4E913FAA37AD3A89613643B6201 \ + DD792F5973C6DE52C432CBDAC77ABFA00DDBF2B7 \ + CC68F5A3106FF448322E48ED27F5E38D5B0A215F \ + 8FCCA13FEF1D0C2E91008E09770F7A9A5AE15600 \ + 890C08DB8579162FEE0DF9DB8BEAB4DFCF555EF4 \ + C82FA3AE1CBEDC6BE46B9360C43CEC45C17AB93C \ + 108F52B48DB57BB0CC439B2997B01419BD92F80A \ + A363A499291CBBC940DD62E41F10027AF002F8B0 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$ARCH.tar.xz" \ + && curl -fsSLO --compressed "https://nodejs.org/dist/v$NODE_VERSION/SHASUMS256.txt.asc" \ + && gpg --batch --decrypt --output SHASUMS256.txt SHASUMS256.txt.asc \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && grep " node-v$NODE_VERSION-linux-$ARCH.tar.xz\$" SHASUMS256.txt | sha256sum -c - \ + && tar -xJf "node-v$NODE_VERSION-linux-$ARCH.tar.xz" -C /usr/local --strip-components=1 --no-same-owner \ + && rm "node-v$NODE_VERSION-linux-$ARCH.tar.xz" SHASUMS256.txt.asc SHASUMS256.txt \ + # Remove unused OpenSSL headers to save ~34MB. See this NodeJS issue: https://github.com/nodejs/node/issues/46451 + && find /usr/local/include/node/openssl/archs -mindepth 1 -maxdepth 1 ! -name "$OPENSSL_ARCH" -exec rm -rf {} \; \ +# && apt-mark auto '.*' > /dev/null \ +# && find /usr/local -type f -executable -exec ldd '{}' ';' \ +# | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ +# | sort -u \ +# | xargs -r dpkg-query --search \ +# | cut -d: -f1 \ +# | sort -u \ +# | xargs -r apt-mark manual \ +# && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + && ln -s /usr/local/bin/node /usr/local/bin/nodejs \ + # smoke tests + && node --version \ + && npm --version + +ENV YARN_VERSION 1.22.22 + +RUN set -ex \ + && savedAptMark="$(apt-mark showmanual)" \ + && apt-get update && apt-get install -y ca-certificates curl wget gnupg dirmngr --no-install-recommends \ + && rm -rf /var/lib/apt/lists/* \ + # use pre-existing gpg directory, see https://github.com/nodejs/docker-node/pull/1895#issuecomment-1550389150 + && export GNUPGHOME="$(mktemp -d)" \ + && for key in \ + 6A010C5166006599AA17F08146C2130DFD2497F5 \ + ; do \ + gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys "$key" || \ + gpg --batch --keyserver keyserver.ubuntu.com --recv-keys "$key" ; \ + done \ + && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \ + && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \ + && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ + && gpgconf --kill all \ + && rm -rf "$GNUPGHOME" \ + && mkdir -p /opt \ + && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \ + && ln -s /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \ + && rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \ +# && apt-mark auto '.*' > /dev/null \ +# && { [ -z "$savedAptMark" ] || apt-mark manual $savedAptMark > /dev/null; } \ +# && find /usr/local -type f -executable -exec ldd '{}' ';' \ +# | awk '/=>/ { so = $(NF-1); if (index(so, "/usr/local/") == 1) { next }; gsub("^/(usr/)?", "", so); print so }' \ +# | sort -u \ +# | xargs -r dpkg-query --search \ +# | cut -d: -f1 \ +# | sort -u \ +# | xargs -r apt-mark manual \ +# && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \ + # smoke test + && yarn --version \ + && rm -rf /tmp/* diff --git a/docker/README.md b/docker/README.md new file mode 100644 index 0000000..949d1b8 --- /dev/null +++ b/docker/README.md @@ -0,0 +1,4 @@ +We provide two Dockerfiles: + +- `Dockerfile` provides the environment to build the obsw. +- `Dockerfile_Runner` is used to run our CI Jobs. It mainly adds node.js:20 to run gitea/github actions. \ No newline at end of file diff --git a/docker/compile_fsbl/.gitignore b/docker/compile_fsbl/.gitignore deleted file mode 100644 index 43c5ba6..0000000 --- a/docker/compile_fsbl/.gitignore +++ /dev/null @@ -1 +0,0 @@ -embeddedsw \ No newline at end of file diff --git a/docker/compile_fsbl/Dockerfile b/docker/compile_fsbl/Dockerfile deleted file mode 100644 index b1e1582..0000000 --- a/docker/compile_fsbl/Dockerfile +++ /dev/null @@ -1,15 +0,0 @@ -FROM debian:12.5 - -ENV DEBIAN_FRONTEND=noninteractive - -# Install required packages -RUN apt-get update && apt-get install -y \ - make \ - cmake \ - gcc-arm-none-eabi \ - && rm -rf /var/lib/apt/lists/* - # Remove the package lists to reduce the image size - - -WORKDIR /fsbl/ - diff --git a/docker/compile_mission/Dockerfile b/docker/compile_mission/Dockerfile deleted file mode 100644 index 837a46d..0000000 --- a/docker/compile_mission/Dockerfile +++ /dev/null @@ -1,26 +0,0 @@ -# Use Debian 12.5 as the base image -FROM debian:12.5 - -# Set environment variables to avoid any interactive dialogue -ENV DEBIAN_FRONTEND=noninteractive - -# Install dependencies required for Rust and rustup -RUN apt-get update && apt-get install -y curl gcc cmake && \ - # Clean up the apt cache to reduce image size - apt-get clean && rm -rf /var/lib/apt/lists/* - -# Install Rustup and select the nightly toolchain -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly && \ - . $HOME/.cargo/env - -# Add the Rust toolchain binaries to PATH -ENV PATH="/root/.cargo/bin:${PATH}" - -# Install the nightly Rust toolchain, the rust-src component, and set the override -RUN rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - - -# Your project's specific setup steps here -# For example, setting the working directory and copying your project files into the container -WORKDIR /mission_rust/ - diff --git a/docker/compile_obsw/Dockerfile b/docker/compile_obsw/Dockerfile deleted file mode 100644 index 0da1195..0000000 --- a/docker/compile_obsw/Dockerfile +++ /dev/null @@ -1,29 +0,0 @@ -FROM debian:12.5 - -ENV DEBIAN_FRONTEND=noninteractive - -# Install required packages -RUN apt-get update && apt-get install -y \ - make \ - cmake \ - gcc \ - curl \ - gcc-arm-none-eabi \ - doxygen \ - graphviz \ - && rm -rf /var/lib/apt/lists/* - # Remove the package lists to reduce the image size - -# Install Rustup and select the nightly toolchain -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain nightly && \ - . $HOME/.cargo/env - -# Add the Rust toolchain binaries to PATH -ENV PATH="/root/.cargo/bin:${PATH}" - -# Install the nightly Rust toolchain, the rust-src component, and set the override -RUN rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - -WORKDIR /obsw/ - -# ENV DOT_PATH=/usr/local/bin # Works without this in debian @paul \ No newline at end of file -- 2.43.0 From 753beba2f4891f9b6cb0cabd17c33e2c36f67663 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Tue, 17 Dec 2024 15:09:41 +0100 Subject: [PATCH 02/13] CI --- .gitea/workflows/build.yaml | 31 ++++++++++++++++++++++++++ .gitea/workflows/ci.yaml | 32 +++++--------------------- .gitea/workflows/release.yaml | 42 +++++++++++++++++++++++++++++++++++ .gitmodules | 4 ++-- 4 files changed, 80 insertions(+), 29 deletions(-) create mode 100644 .gitea/workflows/build.yaml create mode 100644 .gitea/workflows/release.yaml diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml new file mode 100644 index 0000000..196de4f --- /dev/null +++ b/.gitea/workflows/build.yaml @@ -0,0 +1,31 @@ +name: ROMEO Builder +on: + workflow_call + +jobs: + Build_Code: + runs-on: romeo_runner + steps: + - name: Check out repository code + uses: actions/checkout@v4 + with: + token: ${{ secrets.ROMEO_NUMALFIX_CI_TOKEN }} + submodules: 'recursive' + - name: Configure z7 + run: | + mkdir build_z7 + cd build_z7 + cmake -DCMAKE_TOOLCHAIN_FILE=../bsp_z7/cmake/arm-none-eabi.toolchain .. + - name: Build z7 + run: | + cd build_z7 + make -j8 + - name: Configure linux + run: | + mkdir build_linux + cd build_linux + cmake .. + - name: Build linux + run: | + cd build_linux + make -j8 diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 55eca75..5a111a0 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -1,30 +1,8 @@ -name: ROMEO CI Builder +name: ROMEO CI Job on: push + jobs: - Build Code: - runs-on: romeo-builder - steps: - - name: Check out repository code - uses: actions/checkout@v4 - with: - token: ${{ secrets.ROMEO_BUILDFIX_TOKEN }} - submodules: 'recursive' - - name: Configure z7 - run: | - mkdir build_z7 - cd build_z7 - cmake -DCMAKE_TOOLCHAIN_FILE=../bsp_z7/cmake/arm-none-eabi.toolchain .. - - name: Build z7 - run: | - cd build_z7 - make -j8 - - name: Configure linux - run: | - mkdir build_linux - cd build_linux - cmake .. - - name: Build linux - run: | - cd build_linux - make -j8 + Build_Code: + uses: ./.gitea/workflows/build.yaml + secrets: inherit diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml new file mode 100644 index 0000000..af8818b --- /dev/null +++ b/.gitea/workflows/release.yaml @@ -0,0 +1,42 @@ +name: ROMEO Release Job +on: push + + +jobs: + Build_Code: + runs-on: romeo_runner + steps: + - name: Check out repository code + uses: actions/checkout@v4 + with: + token: ${{ secrets.ROMEO_NUMALFIX_CI_TOKEN }} + submodules: 'recursive' + - name: Configure z7 + run: | + mkdir build_z7 + cd build_z7 + cmake -DCMAKE_TOOLCHAIN_FILE=../bsp_z7/cmake/arm-none-eabi.toolchain .. + - name: Build z7 + run: | + cd build_z7 + make -j8 + - name: Configure linux + run: | + mkdir build_linux + cd build_linux + cmake .. + - name: Build linux + run: | + cd build_linux + make -j8 + - name: Create artefacts + run: | + cp build_z7/romeo-obsw romeo-obsw_v1234 + date > description + echo 1234 >> description + - name: Create Release + uses: https://gitea.com/actions/gitea-release-action@v1 + with: + body_path: description + files: |- + romeo-obsw_v1234 diff --git a/.gitmodules b/.gitmodules index 5815ed4..7cb3ea4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,7 @@ url = https://github.com/FreeRTOS/FreeRTOS-Kernel [submodule "contrib/lwip"] path = contrib/lwip - url = ../lwip + url = ../../romeo/lwip [submodule "fsbl-compiled"] path = fsbl-compiled - url = ../fsbl-compiled + url = ../../romeo/fsbl-compiled -- 2.43.0 From 8cd505dba01d02fddaf44832c5185afa202cadb9 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Tue, 17 Dec 2024 15:12:32 +0100 Subject: [PATCH 03/13] CI --- .gitea/workflows/release.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index af8818b..f7799fa 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -36,7 +36,7 @@ jobs: echo 1234 >> description - name: Create Release uses: https://gitea.com/actions/gitea-release-action@v1 - with: - body_path: description - files: |- - romeo-obsw_v1234 + with: + body_path: description + files: |- + romeo-obsw_v1234 -- 2.43.0 From c195ea451f0de0db666a271852edc6af7d2c52e3 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Tue, 17 Dec 2024 15:13:22 +0100 Subject: [PATCH 04/13] CI --- .gitea/workflows/release.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index f7799fa..9838302 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -35,8 +35,8 @@ jobs: date > description echo 1234 >> description - name: Create Release - uses: https://gitea.com/actions/gitea-release-action@v1 - with: - body_path: description - files: |- - romeo-obsw_v1234 + uses: https://gitea.com/actions/gitea-release-action@v1 + with: + body_path: description + files: |- + romeo-obsw_v1234 -- 2.43.0 From a9ff327036dab0bcbf7ac09f42450f1d8d18d8b9 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 14:32:18 +0100 Subject: [PATCH 05/13] ci --- .gitea/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 9838302..a2cad4e 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -34,6 +34,7 @@ jobs: cp build_z7/romeo-obsw romeo-obsw_v1234 date > description echo 1234 >> description + echo ${{ secrets.ROMEO_NUMALFIX_CI_TOKEN }} - name: Create Release uses: https://gitea.com/actions/gitea-release-action@v1 with: -- 2.43.0 From 99db0b1420a961e927dbff6f71f898a9c56264c9 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 14:36:03 +0100 Subject: [PATCH 06/13] v1 --- .gitea/workflows/release.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index a2cad4e..e1bb63c 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -39,5 +39,6 @@ jobs: uses: https://gitea.com/actions/gitea-release-action@v1 with: body_path: description + tag_name: v1.2.3 files: |- romeo-obsw_v1234 -- 2.43.0 From 1b81639b27011a7a917c80cac588909176e2b1a8 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 14:39:06 +0100 Subject: [PATCH 07/13] v1 --- .gitea/workflows/release.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index e1bb63c..e0411f2 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -39,6 +39,7 @@ jobs: uses: https://gitea.com/actions/gitea-release-action@v1 with: body_path: description - tag_name: v1.2.3 + tag_name: v1.2.4 + target_commitish: ${gitea.GITHUB_SHA} files: |- romeo-obsw_v1234 -- 2.43.0 From 22d2e932a14ab7c2f33fe8a586befed402c4e7a1 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 14:40:45 +0100 Subject: [PATCH 08/13] v1 --- .gitea/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index e0411f2..0a77281 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -40,6 +40,6 @@ jobs: with: body_path: description tag_name: v1.2.4 - target_commitish: ${gitea.GITHUB_SHA} + target_commitish: ${GITHUB_SHA} files: |- romeo-obsw_v1234 -- 2.43.0 From f904f40f9259ff0fa1530b6ebaf21394197767a4 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 14:41:58 +0100 Subject: [PATCH 09/13] v1 --- .gitea/workflows/release.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 0a77281..3f43304 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -40,6 +40,6 @@ jobs: with: body_path: description tag_name: v1.2.4 - target_commitish: ${GITHUB_SHA} + target_commitish: ${{ GITHUB_SHA }} files: |- romeo-obsw_v1234 -- 2.43.0 From c32c018025c331f337cb10b71ff53df9d0c83bda Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 14:44:11 +0100 Subject: [PATCH 10/13] v1 --- .gitea/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 3f43304..1cf61a7 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -34,12 +34,12 @@ jobs: cp build_z7/romeo-obsw romeo-obsw_v1234 date > description echo 1234 >> description - echo ${{ secrets.ROMEO_NUMALFIX_CI_TOKEN }} + echo ${{ GITHUB_SHA }} >> description - name: Create Release uses: https://gitea.com/actions/gitea-release-action@v1 with: body_path: description - tag_name: v1.2.4 + tag_name: v1.2.5 target_commitish: ${{ GITHUB_SHA }} files: |- romeo-obsw_v1234 -- 2.43.0 From 86101f42b3a82ccc200cb3c69b8585a8535e1960 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 14:48:46 +0100 Subject: [PATCH 11/13] v1 --- .gitea/workflows/release.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitea/workflows/release.yaml b/.gitea/workflows/release.yaml index 1cf61a7..3e6953a 100644 --- a/.gitea/workflows/release.yaml +++ b/.gitea/workflows/release.yaml @@ -34,12 +34,12 @@ jobs: cp build_z7/romeo-obsw romeo-obsw_v1234 date > description echo 1234 >> description - echo ${{ GITHUB_SHA }} >> description + echo ${{ env.GITHUB_SHA }} >> description - name: Create Release uses: https://gitea.com/actions/gitea-release-action@v1 with: body_path: description tag_name: v1.2.5 - target_commitish: ${{ GITHUB_SHA }} + target_commitish: ${{ env.GITHUB_SHA }} files: |- romeo-obsw_v1234 -- 2.43.0 From 2daf0e89d5c0c819ed5087ef2a94b2fae3073527 Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 22:29:05 +0100 Subject: [PATCH 12/13] pull --- .gitea/workflows/pull.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .gitea/workflows/pull.yaml diff --git a/.gitea/workflows/pull.yaml b/.gitea/workflows/pull.yaml new file mode 100644 index 0000000..a323b06 --- /dev/null +++ b/.gitea/workflows/pull.yaml @@ -0,0 +1,11 @@ +name: ROMEO Pull +on: + pull_request: + +jobs: + Build_Code: + runs-on: romeo_runner + steps: + - name: Build linux + run: | + echo ${{ env.GITHUB_SHA }} -- 2.43.0 From cc5c789fc32d87741c073a562caec6d7288ccb6e Mon Sep 17 00:00:00 2001 From: Ulrich Mohr Date: Wed, 18 Dec 2024 22:31:20 +0100 Subject: [PATCH 13/13] canary --- canary | 1 + 1 file changed, 1 insertion(+) create mode 100644 canary diff --git a/canary b/canary new file mode 100644 index 0000000..d00491f --- /dev/null +++ b/canary @@ -0,0 +1 @@ +1 -- 2.43.0