test

jeffreytse · Mar 28, 2024 · 27500a4 · 27500a4
1 parent b4edbc7
commit 27500a4
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/action.yml b/action.yml
@@ -23,6 +23,9 @@ inputs:
  cname:
  description: 'The cname to use for the site'
  required: false
+ ruby_ver:
+ description: 'The Ruby version'
+ required: false
  bundler_ver:
  description: 'The Bundler version'
  required: false

diff --git a/entrypoint.sh b/entrypoint.sh
@@ -12,6 +12,7 @@ SSH_PRIVATE_KEY=${INPUT_SSH_PRIVATE_KEY:=}
 ACTOR=${INPUT_ACTOR}
 REPOSITORY=${INPUT_REPOSITORY}
 BRANCH=${INPUT_BRANCH}
+RUBY_VER=${INPUT_RUBY_VER:=3.0.6-1}
 BUNDLER_VER=${INPUT_BUNDLER_VER:=~>2.4.0}
 JEKYLL_SRC=${INPUT_JEKYLL_SRC:=./}
 JEKYLL_CFG=${INPUT_JEKYLL_CFG:=./_config.yml}

diff --git a/script/init_environment.sh b/script/init_environment.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Generate a default secret key
+# To prevent archlinux-keyring from no secret key available to sign with
+pacman-key --init
+
 # Update packages database
 pacman -Syu --noconfirm
 
@@ -12,10 +16,7 @@ if [[ -n "${SSH_PRIVATE_KEY}" ]]; then
 fi
 
 # Installing ruby libraries
-pacman -S --noconfirm ruby2.7 ruby-bundler
-
-# Setting default ruby version
-cp /usr/bin/ruby-2.7 /usr/bin/ruby
+pacman -S --noconfirm ruby=${RUBY_VERSION} ruby-bundler
 
 # debug
 ruby -v && bundle version