Skip to content

Commit

Permalink
Merge pull request #292 from helxplatform/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
joshua-seals authored Aug 11, 2023
2 parents b96b24c + 9726e5d commit fd67042
Show file tree
Hide file tree
Showing 10 changed files with 16 additions and 1,440 deletions.
20 changes: 8 additions & 12 deletions .github/workflows/code-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ on:
paths-ignore:
- README.md
- .old_cicd/*
- .github/*
- .github/workflows/*
# - .github/*
# - .github/workflows/*
- LICENSE
- .gitignore
- .dockerignore
Expand All @@ -39,7 +39,7 @@ jobs:
############################## flake8-linter ##############################
flake8-linter:
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
# if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v3

Expand Down Expand Up @@ -72,9 +72,8 @@ jobs:

############################## test-image-build ##############################
test-image-build:
needs: flake8-linter
runs-on: ubuntu-latest
if: ${{ github.actor != 'dependabot[bot]' }}
# if: ${{ github.actor == 'dependabot[bot]' }}
steps:
- uses: actions/checkout@v3

Expand All @@ -97,19 +96,16 @@ jobs:
password: ${{ secrets.DOCKERHUB_TOKEN }}
logout: true

# - name: Sanitize repo slug
# uses: actions/github-script@v6
# id: repo_slug
# with:
# result-encoding: string
# script: return '${{ secrets.CONTAINERHUB_URL }}/${{ github.repository }}'.toLowerCase()


# Notes on Cache:
# https://docs.docker.com/build/ci/github-actions/examples/#inline-cache
- name: Build Container
uses: docker/build-push-action@v4
with:
context: .
push: false
push: true
tags: |
${{ github.repository }}:test_image_${{ github.ref_name }}
cache-from: type=registry,ref=${{ github.repository }}:buildcache
cache-to: type=registry,ref=${{ github.repository }}:buildcache,mode=max
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM python:3.9.0-slim
FROM python:3.9.17-slim-bullseye

ENV PYTHONDONTWRITEBYTECODE 1
ENV PYTHONUNBUFFERED 1
Expand Down
40 changes: 0 additions & 40 deletions artillery-tests/cookies.js

This file was deleted.

95 changes: 0 additions & 95 deletions artillery-tests/helpers.js

This file was deleted.

17 changes: 0 additions & 17 deletions artillery-tests/package.json

This file was deleted.

Loading

0 comments on commit fd67042

Please sign in to comment.