ci: Fix failure

Author: hyperupcall

.editorconfig

@@ -2,6 +2,10 @@
 indent_style = tab
 indent_size = 3
 
+[*.yml]
+indent_style = space
+indent_size = 2
+
 [*.md]
 indent_style = space
 indent_size = 2

.github/workflows/ci.yml

@@ -1,58 +1,97 @@
-name: CI
+name: 'ci'
 
 on:
   push:
-    branches: [ main, fix-ci ]
+    branches: [main, dev, ci/*]
   pull_request:
-    branches: [ main, fix-ci ]
+    branches: [main, dev, ci/*]
+
+permissions: read-all
+
+# env:
+
+defaults:
+  run:
+    shell: bash
+    working-directory: ./
 
 jobs:
-  build-linux:
+  test-linux:
+    name: 'Linux Test'
     strategy:
+      fail-fast: false
       matrix:
-        bashver: ["4.3", "4.4", "5.0", "latest"]
+        os: ['ubuntu-20.04'] # ubuntu-18.04, ubuntu-20.04, ubuntu-latest
+        bash-version: ['4.3', '4.4', '5.0', 'latest']
 
-    runs-on: ubuntu-latest
+    runs-on: '${{ matrix.os }}'
 
     steps:
-      - uses: actions/checkout@v2
+      - name: Checkout repository
+        uses: actions/checkout@v2
         with:
           submodules: true
 
-      - name: Install dependencies
+      - name: Install Bats
         run: |
-          wget --no-check-certificate -O bats.tar.gz https://github.com/bats-core/bats-core/archive/v1.3.0.tar.gz
-          mkdir bats
-          tar --strip-components=1 -xvzf bats.tar.gz -C bats
+          subdir='.workflow-data'
+          bats_version='1.3.0'
+
+          curl -LsSo "$subdir/bats-core.tar.gz" --create-dirs \
+            https://github.com/bats-core/bats-core/archive/v$bats_version.tar.gz
+          tar --extract --transform "s,bats-core-$bats_version,bats-core," -C "$subdir" -f "$subdir/bats-core.tar.gz"
 
       - name: Build image
         run: |
-          docker build --build-arg bashver=${{ matrix.bashver }} --tag bpm/bpm:bash-${{ matrix.bashver }} .
-          docker run bash:${{ matrix.bashver }} --version
+          docker build \
+            --build-arg bash_version=${{ matrix.bash-version }} \
+            --tag bpm:bash-${{ matrix.bash-version }} \
+            .
 
       - name: Run tests
         run: |
-          time docker run bpm/bpm:bash-${{ matrix.bashver }} --tap /opt/bpm/tests
+          time docker run bpm:bash-${{ matrix.bash-version }} \
+            --tap tests
+
+  test-mac:
+    name: 'MacOS Test'
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['macos-10.15'] # macos-10.15, macos-11, macos-latest
 
-  build-mac:
-    runs-on: macos-latest
+    runs-on: '${{ matrix.os }}'
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: 'actions/checkout@v2'
         with:
           submodules: true
+          path: 'source'
 
-      - name: Install dependencies
+      - name: Install Prerequisites
         run: |
-          wget --no-check-certificate -O bats.tar.gz https://github.com/bats-core/bats-core/archive/v1.3.0.tar.gz
-          mkdir bats
-          tar --strip-components=1 -xvzf bats.tar.gz -C bats
+          brew install bash coreutils gnu-tar
 
-          brew install bash coreutils
+      - name: Install Bats
+        run: |
+          subdir='.workflow-data'
+          bats_version='1.3.0'
+
+          cd source
+
+          curl -LsSo "$subdir/bats-core.tar.gz" --create-dirs \
+            https://github.com/bats-core/bats-core/archive/v$bats_version.tar.gz
+          gtar --extract --transform "s,bats-core-$bats_version,bats-core," -C "$subdir" -f "$subdir/bats-core.tar.gz"
 
       - name: Run tests
         run: |
+          subdir='.workflow-data'
+
+          cd source
+
           bash --version
           git config --global user.email "user@example.com"
           git config --global user.name "User Name"
-          time bats/bin/bats --tap tests
+          printf "%s\n" "---"
+
+          time "./$subdir/bats-core/bin/bats" --tap tests

.gitignore

@@ -1,11 +1,12 @@
-ARG bashver=latest
+ARG bash_version
 
-FROM bash:${bashver}
+FROM bash:${bash_version}
 
-RUN apk add --no-cache git; \
-	git config --global user.email "user@example.com"; \
-	git config --global user.name "User Name";
+RUN apk add --no-cache git \
+	&& git config --global user.email "user@example.com" \
+	&& git config --global user.name "User Name"
 
-COPY . /opt/bpm/
+COPY . /opt/bpm/source
 
-ENTRYPOINT ["bash", "/opt/bpm/bats/bin/bats"]
+WORKDIR /opt/bpm/source
+ENTRYPOINT ["/opt/bpm/source/.workflow-data/bats-core/bin/bats"]

Doc

@@ -15,7 +15,7 @@ $ bpm add rupa/z tj/git-extras aristocratos/bashtop JosefZIla/bash2048
 This symlinks all executable scripts to a common directory. It does this for completion files and man pages as well
 
 ```sh
-$ ls -l --color=always ~/.local/share/bpm/cellar/bin/
+$ ls -l ~/.local/share/bpm/cellar/bin/
 ... bash2048.sh -> /home/edwin/.local/share/bpm/cellar/packages/github.com/JosefZIla/bash2048/bash2048.sh
 ... bashtop -> /home/edwin/.local/share/bpm/cellar/packages/github.com/aristocratos/bashtop/bashtop
 ... git-alias -> /home/edwin/.local/share/bpm/cellar/packages/github.com/tj/git-extras/bin/git-alias
@@ -58,4 +58,4 @@ Why not use `bpkg` or `Basher`? Because `bpm`...
 - More flexibly parses command line arguments (basher)
 - Install local directories as packages (bpkg)
 
-I I forked Basher because it had an excellent test suite and its behavior for installing packages made more sense to me, compared to `bpkg`
+I forked Basher because it had an excellent test suite and its behavior for installing packages made more sense to me, compared to `bpkg`

Dockerfile

@@ -6,20 +6,20 @@ test_util.get_bpm_root() {
 	if ! REPLY="$(
 		while [[ ! -d ".git" && "$PWD" != / ]]; do
 			if ! cd ..; then
-				printf "%s\n" "Error: Could not cd to BPM directory"
+				printf "%s\n" "Error: Could not cd to BPM directory" >&2
 				exit 1
 			fi
 		done
 
 		if [[ $PWD == / ]]; then
-			printf "%s\n" "Error: Could not find root BPM directory"
+			printf "%s\n" "Error: Could not find root BPM directory" >&2
 			exit 1
 		fi
 
 		# BPM root is the parent directory of 'source', which holds
 		# the Git repository
 		if ! cd ..; then
-			printf "%s\n" "Error: Could not cd to BPM directory"
+			printf "%s\n" "Error: Could not cd to BPM directory" >&2
 			exit 1
 		fi
 		printf "%s" "$PWD"