Add some fixes to Bootstrap CI stuff
Also did a bit tweaking on Cloud Shell bashrc btw Signed-off-by: Andrei Jiroh Eugenio Halili <ajhalili2006@gmail.com>
This commit is contained in:
parent
e4793e6b2f
commit
b0856f7a5e
|
@ -5,19 +5,26 @@ on:
|
|||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
ubuntu-gha:
|
||||
ubuntu-latest-gha:
|
||||
name: Ubuntu 22.04 - GitHub Actions VM
|
||||
runs-on: ubuntu-22.04
|
||||
steps:
|
||||
- run: curl -fsSL https://github.com/ajhalili2006/dotfiles/raw/main/bootstrap | bash -
|
||||
env:
|
||||
STORJ_ACCESS_GRANT: ${{secrets.STORJ_ACCESS_GRANT}}
|
||||
ubuntu-20.04-gha:
|
||||
runs-on: ubuntu-20.04
|
||||
name: Ubuntu 20.04 - GitHub Actions VM
|
||||
steps:
|
||||
- run: curl -fsSL https://github.com/ajhalili2006/dotfiles/raw/main/bootstrap | bash -
|
||||
env:
|
||||
STORJ_ACCESS_GRANT: ${{secrets.STORJ_ACCESS_GRANT}}
|
||||
ubuntu-docker:
|
||||
name: Ubuntu 22.04 - Docker
|
||||
name: Ubuntu 20.04 - Docker
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: actions/checkout@v3
|
||||
- run: DOCKER_BUILDKIT=1 docker build -f tests/ubuntu/Dockerfile -t ajhalili2006/dotfiles-testing-rig tests
|
||||
- run: DOCKER_BUILDKIT=1 docker build -f ubuntu/Dockerfile -t ajhalili2006/dotfiles-testing-rig tests
|
||||
- run: docker run --rm --volume $PWD/exec-log.txt:/var/tests/exec-log.txt -u 1000 -e STORJ_ACCESS_GRANT ajhalili2006/dotfiles-testing-rig "curl -fsSL https://github.com/ajhalili2006/dotfiles/raw/main/bootstrap | bash -"
|
||||
env:
|
||||
STORJ_ACCESS_GRANT: ${{secrets.STORJ_ACCESS_GRANT}}
|
||||
|
@ -25,3 +32,4 @@ jobs:
|
|||
USE_NVM: "1"
|
||||
#FF_LEGACY_DOTFILES_SECRETS_REPO: "1"
|
||||
#FF_SETUP_HOMEBREW: "1"
|
||||
working-directory: tests
|
||||
|
|
|
@ -4,10 +4,10 @@
|
|||
# for examples
|
||||
|
||||
# If not running interactively, don't do anything
|
||||
#case $- in
|
||||
# *i*) ;;
|
||||
# *) return;;
|
||||
#esac
|
||||
case $- in
|
||||
*i*) ;;
|
||||
*) return;;
|
||||
esac
|
||||
|
||||
# don't put duplicate lines or lines starting with space in the history.
|
||||
# See bash(1) for more options
|
||||
|
@ -110,9 +110,9 @@ fi
|
|||
export LD_LIBRARY_PATH=/usr/local/lib
|
||||
|
||||
# After all of these, source my customized Google Cloud Shell bahsrc.
|
||||
#if [ -f "/google/devshell/bashrc.google" ]; then
|
||||
# source "$HOME/.dotfiles/bashrc/google.bashrc"
|
||||
#fi
|
||||
if [ -f "/google/devshell/bashrc.google" ]; then
|
||||
source "$HOME/.dotfiles/bashrc/google.bashrc"
|
||||
fi
|
||||
|
||||
# Instead of using Google Cloud Shell's preinstalled nvm, I manually installed it on my home directory.
|
||||
export NVM_DIR="$HOME/.nvm"
|
||||
|
|
Loading…
Reference in New Issue