Skip to content

Commit

Permalink
bringing up to date
Browse files Browse the repository at this point in the history
Signed-off-by: Emily Rodriguez <[email protected]>
  • Loading branch information
Emily Rodriguez committed Jun 27, 2022
2 parents fb73a45 + 4807873 commit c297bec
Show file tree
Hide file tree
Showing 111 changed files with 129,798 additions and 8,964 deletions.
6 changes: 5 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@
"unicorn/no-zero-fractions": "off",
"unicorn/no-array-for-each": "off",
"unicorn/explicit-length-check": "off",
"unicorn/no-process-exit": "off",
"no-process-exit": "off",
"no-await-in-loop": "off",
"no-control-regex": "off",
"max-nested-callbacks": "off",
"unicorn/prefer-json-parse-buffer": "off",
"camelcase": "off", // Camel case fields are used in CKL
"no-console": "off",
"node/no-missing-import": "off",
"complexity": "off"
"complexity": "off",
"no-constant-condition": "off"
}
}
8 changes: 4 additions & 4 deletions .github/workflows/build-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,22 +26,22 @@ jobs:
run: npm install

- name: Pack Windows Installer
run: yarn run oclif-dev pack:win
run: yarn run oclif pack win

- name: Pack Debian Package
run: sudo yarn run oclif-dev pack:deb
run: sudo yarn run oclif pack deb

- name: Upload SAF-CLI Windows Build x64 Artifact
uses: actions/upload-artifact@v2
with:
name: SAF-CLI Windows Build x64
path: dist/win/saf-*-x64.exe
path: dist/win32/saf-*-x64.exe

- name: Upload SAF-CLI Windows Build x86 Artifact
uses: actions/upload-artifact@v2
with:
name: SAF-CLI Windows Build x86
path: dist/win/saf-*-x86.exe
path: dist/win32/saf-*-x86.exe

- name: Upload SAF-CLI Debian x64 Artifact
uses: actions/upload-artifact@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
run: rm -rf test

- name: npm install and pack
run: yarn run oclif-dev pack:macos
run: yarn run oclif pack macos

- name: Upload SAF-CLI macOS Installer Artifact
uses: actions/upload-artifact@v2
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/e2e-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ jobs:

- name: Install dependencies
run: yarn install

- name: Prepack
run: yarn prepack

- name: Run e2e tests
run: yarn test
32 changes: 32 additions & 0 deletions .github/workflows/test-docker-image.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
name: Build and Test SAF CLI Docker Image on every Pull Request or Push to Main

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

env:
TEST_TAG: saf:testTag

jobs:
docker:
runs-on: ubuntu-latest
steps:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Checkout the SAF Repository
uses: actions/checkout@v2
- name: Build Docker Image
id: docker_build
uses: docker/build-push-action@v2
with:
context: .
file: Dockerfile
push: false
load: true
tags: ${{ env.TEST_TAG }}
- name: Test
run: |
docker run --rm ${{ env.TEST_TAG }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ COPY --from=builder /build/saf.tgz /build/
RUN npm install -g /build/saf.tgz

# Useful for CI pipelines
RUN apk add bash jq
RUN apk add bash jq curl ca-certificates

ENTRYPOINT ["saf"]
VOLUME ["/share"]
Expand Down
Loading

0 comments on commit c297bec

Please sign in to comment.