[FIX] Fix up actions a bit
This commit is contained in:
parent
e75d5b7179
commit
dac319ab19
2 changed files with 7 additions and 10 deletions
|
@ -24,4 +24,4 @@ runs:
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
echo We are on "${{runner.os}}", requested "${{inputs.compiler}}" as CC
|
echo We are on "${{runner.os}}", requested "${{inputs.compiler}}" as CC
|
||||||
setup "${{ runner.os }}" "${{inputs.compiler}}" "${{inputs.ssl}}"
|
${GITHUB_ACTION_PATH}/setup "${{ runner.os }}" "${{inputs.compiler}}" "${{inputs.ssl}}"
|
||||||
|
|
9
setup
9
setup
|
@ -10,8 +10,7 @@ DISTRO=$(grep -E '^NAME=' /etc/os-release |
|
||||||
# Installs a package using the native OS's package manager.
|
# Installs a package using the native OS's package manager.
|
||||||
install_pkg() {
|
install_pkg() {
|
||||||
case $DISTRO in
|
case $DISTRO in
|
||||||
"Ubuntu")
|
"Ubuntu"|"Debian GNU/Linux")
|
||||||
"Debian GNU/Linux" )
|
|
||||||
apt install -y $1
|
apt install -y $1
|
||||||
;;
|
;;
|
||||||
"Arch Linux")
|
"Arch Linux")
|
||||||
|
@ -23,8 +22,7 @@ install_pkg() {
|
||||||
install_compiler() {
|
install_compiler() {
|
||||||
echo '::group::Setting up a compiler'
|
echo '::group::Setting up a compiler'
|
||||||
case $DISTRO in
|
case $DISTRO in
|
||||||
"Ubuntu" )
|
"Ubuntu"|"Debian GNU/Linux")
|
||||||
"Debian GNU/Linux" )
|
|
||||||
install_pkg build-essential
|
install_pkg build-essential
|
||||||
[ $COMPILER = 'clang' ] && install_pkg clang
|
[ $COMPILER = 'clang' ] && install_pkg clang
|
||||||
|
|
||||||
|
@ -41,8 +39,7 @@ install_compiler() {
|
||||||
install_ssl() {
|
install_ssl() {
|
||||||
echo '::group::Setting up SSL'
|
echo '::group::Setting up SSL'
|
||||||
case $DISTRO in
|
case $DISTRO in
|
||||||
"Ubuntu" )
|
"Ubuntu"|"Debian GNU/Linux")
|
||||||
"Debian GNU/Linux" )
|
|
||||||
# Doesn't seem like Debian got LibreSSL
|
# Doesn't seem like Debian got LibreSSL
|
||||||
[ $SSL = 'libressl' ] && echo "::error ::LibreSSL is not on Debian"
|
[ $SSL = 'libressl' ] && echo "::error ::LibreSSL is not on Debian"
|
||||||
install_pkg openssl
|
install_pkg openssl
|
||||||
|
|
Loading…
Reference in a new issue