ajhalili2006
/
dotfiles
mirror of https://gitlab.com/ajhalili2006/dotfiles.git
1
1
Fork 0
Code Releases Activity

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:
Andrei Jiroh Halili 2022-06-11 15:06:18 +00:00
parent e4793e6b2f
commit b0856f7a5e
Signed by: ajhalili2006
GPG Key ID: A30EBE40AD856D88
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/workflows/test-bootstrap-script.yml vendored
View File

@ -5,19 +5,26 @@ on:
workflow_dispatch: workflow_dispatch:
jobs: jobs:
ubuntu-gha: ubuntu-latest-gha:
name: Ubuntu 22.04 - GitHub Actions VM name: Ubuntu 22.04 - GitHub Actions VM
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- run: curl -fsSL https://github.com/ajhalili2006/dotfiles/raw/main/bootstrap | bash - - run: curl -fsSL https://github.com/ajhalili2006/dotfiles/raw/main/bootstrap | bash -
env: env:
STORJ_ACCESS_GRANT: ${{secrets.STORJ_ACCESS_GRANT}} 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: ubuntu-docker:
name: Ubuntu 22.04 - Docker name: Ubuntu 20.04 - Docker
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v3 - 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 -" - 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: env:
STORJ_ACCESS_GRANT: ${{secrets.STORJ_ACCESS_GRANT}} STORJ_ACCESS_GRANT: ${{secrets.STORJ_ACCESS_GRANT}}
@ -25,3 +32,4 @@ jobs:
USE_NVM: "1" USE_NVM: "1"
#FF_LEGACY_DOTFILES_SECRETS_REPO: "1" #FF_LEGACY_DOTFILES_SECRETS_REPO: "1"
#FF_SETUP_HOMEBREW: "1" #FF_SETUP_HOMEBREW: "1"
working-directory: tests

14
bashrc/googlecloudshell.bashrc
View File

@ -4,10 +4,10 @@
# for examples # for examples
# If not running interactively, don't do anything # If not running interactively, don't do anything
#case $- in case $- in
# *i*) ;; *i*) ;;
# *) return;; *) return;;
#esac esac
# don't put duplicate lines or lines starting with space in the history. # don't put duplicate lines or lines starting with space in the history.
# See bash(1) for more options # See bash(1) for more options
@ -110,9 +110,9 @@ fi
export LD_LIBRARY_PATH=/usr/local/lib export LD_LIBRARY_PATH=/usr/local/lib
# After all of these, source my customized Google Cloud Shell bahsrc. # After all of these, source my customized Google Cloud Shell bahsrc.
#if [ -f "/google/devshell/bashrc.google" ]; then if [ -f "/google/devshell/bashrc.google" ]; then
# source "$HOME/.dotfiles/bashrc/google.bashrc" source "$HOME/.dotfiles/bashrc/google.bashrc"
#fi fi
# Instead of using Google Cloud Shell's preinstalled nvm, I manually installed it on my home directory. # Instead of using Google Cloud Shell's preinstalled nvm, I manually installed it on my home directory.
export NVM_DIR="$HOME/.nvm" export NVM_DIR="$HOME/.nvm"