From 09eee6952581d25cb62c497722a73debe811590f Mon Sep 17 00:00:00 2001 From: Load Accumulator Date: Thu, 2 Nov 2023 20:06:45 +0100 Subject: [PATCH] [MOD] Use local repository --- .gitea/actions/setup-build/action.yml | 22 ---------- .gitea/actions/setup-build/setup | 60 --------------------------- .gitea/workflows/test-push.yaml | 5 ++- 3 files changed, 3 insertions(+), 84 deletions(-) delete mode 100644 .gitea/actions/setup-build/action.yml delete mode 100755 .gitea/actions/setup-build/setup diff --git a/.gitea/actions/setup-build/action.yml b/.gitea/actions/setup-build/action.yml deleted file mode 100644 index ea500c3..0000000 --- a/.gitea/actions/setup-build/action.yml +++ /dev/null @@ -1,22 +0,0 @@ -name: Setup a basic build environment -description: Setup a basic build environment with a proper SSL library - -inputs: - compiler: - description: Compiler used for setting up everything - required: false - default: gcc - ssl: - description: SSL library used for Cytoplasm later on - required: false - default: openssl - -outputs: - compiler: - description: Compiler binary - value: '${{ steps.install.outputs.compiler }}' - -runs: - - run: 'echo We are on "${{runner.os}}", requested "${{inputs.compiler}}" as CC' - - run: 'echo hi && setup "${{ runner.os }}" "${{inputs.compiler}}" "${{inputs.ssl}}"' - shell: bash diff --git a/.gitea/actions/setup-build/setup b/.gitea/actions/setup-build/setup deleted file mode 100755 index 82131e6..0000000 --- a/.gitea/actions/setup-build/setup +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/bash - -COMPILER=$2 -SSL=$3 - -DISTRO=$(grep -E '^NAME=' /etc/os-release | - cut -d'=' -f2 | - tr -d '"') - -# Installs a package using the native OS's package manager. -install_pkg() { - case $DISTRO in - "Ubuntu") - "Debian GNU/Linux" ) - apt install -y $1 - ;; - "Arch Linux" ) - pacman -Syu --noconfirm $1 - ;; - esac -} - -install_compiler() { - echo '::group::Setting up a compiler' - case $DISTRO in - "Ubuntu" ) - "Debian GNU/Linux" ) - install_pkg build-essential - [ $COMPILER = 'clang' ] && install_pkg clang - - CC=gcc - [ $COMPILER = 'clang' ] && CC=clang - ;; - "Arch Linux" ) - install_pkg $COMPILER make - CC=gcc - [ $COMPILER = 'clang' ] && CC=clang - esac - echo '::endgroup::' -} -install_ssl() { - echo '::group::Setting up SSL' - case $DISTRO in - "Ubuntu" ) - "Debian GNU/Linux" ) - # Doesn't seem like Debian got LibreSSL - [ $SSL = 'libressl' ] && echo "::error ::LibreSSL is not on Debian" - install_pkg openssl - ;; - "Arch Linux" ) - install_pkg $SSL - esac - echo '::endgroup::' -} - -# Install the compiler and SSL -install_compiler -install_ssl - -echo "compiler=$CC" >> "$GITHUB_OUTPUT" diff --git a/.gitea/workflows/test-push.yaml b/.gitea/workflows/test-push.yaml index 88d58b0..286ab05 100644 --- a/.gitea/workflows/test-push.yaml +++ b/.gitea/workflows/test-push.yaml @@ -4,15 +4,16 @@ on: [push] jobs: # Compiles out everything. - setup-repo: + compile-all: # TODO: More architectures runs-on: debian steps: # Checks out Telodendria, and setups a basic build environment. - name: Checking out Telodendria uses: actions/checkout@v4 + - name: Setup build environment - uses: https://git.freetards.xyz/lda/ci-setup-cc-ssl@master + uses: https://git.telodendria.io/lda/setup-buildenv@master with: compiler: gcc ssl: openssl