Skip to content

Commit

Permalink
Precommit changes
Browse files Browse the repository at this point in the history
  • Loading branch information
theosanderson committed Jul 25, 2022
1 parent 7bbdb3a commit f1ff9c3
Show file tree
Hide file tree
Showing 30 changed files with 7,712 additions and 308 deletions.
68 changes: 34 additions & 34 deletions .deployments/backend_dep.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,34 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: taxoniumbackend
labels:
app: taxoniumbackend
spec:
replicas: 1
selector:
matchLabels:
app: taxoniumbackend
template:
metadata:
labels:
app: taxoniumbackend
spec:
containers:
- name: taxoniumbackend
image: theosanderson/taxonium:master
imagePullPolicy: Always
ports:
- containerPort: 80
livenessProbe:
httpGet:
path: /
port: 80
initialDelaySeconds: 180
periodSeconds: 180
readinessProbe:
httpGet:
path: /
port: 80
initialDelaySeconds: 30
periodSeconds: 5
apiVersion: apps/v1
kind: Deployment
metadata:
name: taxoniumbackend
labels:
app: taxoniumbackend
spec:
replicas: 1
selector:
matchLabels:
app: taxoniumbackend
template:
metadata:
labels:
app: taxoniumbackend
spec:
containers:
- name: taxoniumbackend
image: theosanderson/taxonium:master
imagePullPolicy: Always
ports:
- containerPort: 80
livenessProbe:
httpGet:
path: /
port: 80
initialDelaySeconds: 180
periodSeconds: 180
readinessProbe:
httpGet:
path: /
port: 80
initialDelaySeconds: 30
periodSeconds: 5
2 changes: 1 addition & 1 deletion .devcontainer/setup.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
cd taxonium_web_client
yarn install &
yarn install &
13 changes: 5 additions & 8 deletions .github/workflows/docker-publish-backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,22 @@ on:
repository_dispatch:
workflow_dispatch:
schedule:
- cron: '37 18 * * *'
- cron: "37 18 * * *"
push:
branches: [ master, staging ]
branches: [master, staging]
# Publish semver tags as releases.
tags: [ 'v*.*.*' ]
tags: ["v*.*.*"]
pull_request:
branches: [ master, staging ]
branches: [master, staging]

env:
# Use docker.io for Docker Hub if empty
REGISTRY: docker.io
# github.repository as <account>/<repo>
IMAGE_NAME: theosanderson/taxonium_backend


jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
Expand All @@ -45,8 +43,7 @@ jobs:
if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@d6a3abf1bdea83574e28d40543793018b6035605
with:
cosign-release: 'v1.7.1'

cosign-release: "v1.7.1"

# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
Expand Down
14 changes: 5 additions & 9 deletions .github/workflows/docker-publish-frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,24 +9,22 @@ on:
repository_dispatch:
workflow_dispatch:
schedule:
- cron: '37 18 * * *'
- cron: "37 18 * * *"
push:
branches: [ master ]
branches: [master]
# Publish semver tags as releases.
tags: [ 'v*.*.*' ]
tags: ["v*.*.*"]
pull_request:
branches: [ master ]
branches: [master]

env:
# Use docker.io for Docker Hub if empty
REGISTRY: docker.io
# github.repository as <account>/<repo>
IMAGE_NAME: theosanderson/taxonium_frontend


jobs:
build:

runs-on: ubuntu-latest
permissions:
contents: read
Expand All @@ -45,8 +43,7 @@ jobs:
if: github.event_name != 'pull_request'
uses: sigstore/cosign-installer@d6a3abf1bdea83574e28d40543793018b6035605
with:
cosign-release: 'v1.7.1'

cosign-release: "v1.7.1"

# Workaround: https://github.com/docker/build-push-action/issues/461
- name: Setup Docker buildx
Expand Down Expand Up @@ -81,4 +78,3 @@ jobs:
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

56 changes: 28 additions & 28 deletions .github/workflows/frontend-test.yml
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
name: Frontend

on:
workflow_call:

jobs:
test:
env:
CI: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 17.5
- name: NPM build
run: |
cd taxonium_web_client
npm install -g yarn
yarn install
yarn build
cd build
- name: 'Upload Artifact'
uses: actions/upload-artifact@v3
with:
name: taxonium_web_client_build
path: taxonium_web_client/build
retention-days: 5
name: Frontend

on:
workflow_call:

jobs:
test:
env:
CI: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v3
with:
node-version: 17.5
- name: NPM build
run: |
cd taxonium_web_client
npm install -g yarn
yarn install
yarn build
cd build
- name: "Upload Artifact"
uses: actions/upload-artifact@v3
with:
name: taxonium_web_client_build
path: taxonium_web_client/build
retention-days: 5
36 changes: 18 additions & 18 deletions .github/workflows/integration-test.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
name: Integration Test

on:
repository_dispatch:
workflow_dispatch:
push:
pull_request:
branches: [master]
schedule:
- cron: "0 0 * * *"
jobs:
build:
uses: ./.github/workflows/frontend-test.yml
python:
uses: ./.github/workflows/python-test.yml
selenium:
needs: [build, python]
uses: ./.github/workflows/selenium-test.yml
name: Integration Test

on:
repository_dispatch:
workflow_dispatch:
push:
pull_request:
branches: [master]
schedule:
- cron: "0 0 * * *"
jobs:
build:
uses: ./.github/workflows/frontend-test.yml
python:
uses: ./.github/workflows/python-test.yml
selenium:
needs: [build, python]
uses: ./.github/workflows/selenium-test.yml
2 changes: 1 addition & 1 deletion .github/workflows/prettier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ jobs:
- name: Prettify code
uses: creyD/[email protected]
with:
prettier_options: --write **/*.{js,md,jsx}
prettier_options: --write **/*.{js,md,jsx}
4 changes: 2 additions & 2 deletions .github/workflows/python-build.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
name: Publish Python 🐍 distributions 📦 to PyPI and TestPyPI

on:
on:
push:
paths:
- 'taxoniumtools/**'
- "taxoniumtools/**"
jobs:
build-n-publish:
name: Build and publish Python 🐍 distributions 📦 to PyPI and TestPyPI
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/python-format.yaml2
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ jobs:
- name: Push changes
if: steps.git-check.outputs.modified == 'true'
run: |
git config --global user.name 'github-actions'
git config --global user.email '[email protected]'
git config --global user.name 'github-actions'
git config --global user.email '[email protected]'
git remote set-url origin https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
git commit -am "Automated autoyapf fixes"
git push
Loading

0 comments on commit f1ff9c3

Please sign in to comment.