Skip to content

Commit

Permalink
feat: ⬆️ examples: upgrade yadm, update dotfiles phase, modularize ph…
Browse files Browse the repository at this point in the history
…ases, and more

- Examples:
    - Upgrade yadm
    - Update dotfiles phase
    - Modularize phases
 - Development sandbox:
    - Upgrade Ubuntu image
    - Fix bashrc
 - GitHub actions: Merge e2e tests, remove redundancies
 - Update eslint, prettier configs
 - Rm old reference files
  • Loading branch information
robatron committed Mar 6, 2022
1 parent 940ebca commit 6553fd8
Show file tree
Hide file tree
Showing 20 changed files with 407 additions and 644 deletions.
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
coverage/
node_modules/
36 changes: 0 additions & 36 deletions .github/workflows/e2e-test-bootstrap-apply-master.yml

This file was deleted.

11 changes: 8 additions & 3 deletions .github/workflows/e2e-test-bootstrap-apply.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ defaults:
shell: bash

jobs:
cur-commit:
bootstrap-apply:
strategy:
fail-fast: true
matrix:
Expand All @@ -19,15 +19,20 @@ jobs:
- name: Bootstrap Akinizer from script
run: curl -o- https://raw.githubusercontent.com/robatron/akinizer/$GITHUB_SHA/bootstrap.sh | AK_GIT_REF=$GITHUB_SHA bash

- name: Apply Akinizer configs
run: |
cd $HOME/opt/akinizer/examples
gulp
- name: Re-bootstrap non-destructively
run: curl -o- https://raw.githubusercontent.com/robatron/akinizer/$GITHUB_SHA/bootstrap.sh | AK_GIT_REF=$GITHUB_SHA bash

- name: Apply Akinizer configs
- name: Re-apply non-destructively
run: |
cd $HOME/opt/akinizer/examples
gulp
cur-commit-alt-install-dir:
bootstrap-apply-alt-install-dir:
strategy:
fail-fast: true
matrix:
Expand Down
2 changes: 2 additions & 0 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
coverage/
node_modules/
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ubuntu:20.04
FROM ubuntu:21.10

ARG AK_ROOT=/home/robmc/opt/akinizer

Expand All @@ -23,7 +23,6 @@ USER robmc
RUN mkdir -p ${AK_ROOT}
COPY --chown=robmc:robmc . ${AK_ROOT}
WORKDIR ${AK_ROOT}
RUN ls -lah
RUN AK_INSTALL_ROOT=${AK_ROOT} AK_SKIP_CLONE=yes bash bootstrap.sh

# Set interactive entrypoint conditions
Expand Down
15 changes: 10 additions & 5 deletions deploy/.bashrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,30 @@
# See the README for details.

export AK_ROOT=$(cat ~/.akroot)
export AK_EXAMPLES=$AK_ROOT/examples/

# Required for GPG to work correctly (for yadm decryption)
GPG_TTY=$(tty)
export GPG_TTY

# Sync mounted dir
function sync () {
rsync -av --delete --progress /mnt/akinizer/ $AK_ROOT --exclude node_modules/ --exclude .git
rsync -rltgoDv --delete --force --progress /mnt/akinizer/ $AK_ROOT --exclude node_modules/ --exclude .git --exclude **/__tmp__/
}
sync

# Load NVM
. ~/.nvm/nvm.sh

cd $AK_ROOT
cd $AK_EXAMPLES

cat <<-EOF
Welcome to the Akinizer development container!
Welcome to the Akinizer development sandbox container!
- Run `sync` to update the container repo with the host's repo
- Run `cd examples && gulp` to execute the example akinizer config
- Run 'sync' to update the container repo with the host's repo
- Run 'gulp' to in the 'examples' directory to run the example akinizer config
- The sudo password is: abc123
Expand Down
Loading

0 comments on commit 6553fd8

Please sign in to comment.