Skip to content

Commit

Permalink
Remove api and cli directories in favor of new app
Browse files Browse the repository at this point in the history
- Remove the API and CLI directories entirely
- Remove references from GitHub workflows and replace with new app
  • Loading branch information
botimer committed Nov 6, 2023
1 parent c10cbb0 commit d8738c5
Show file tree
Hide file tree
Showing 103 changed files with 17 additions and 5,416 deletions.
32 changes: 0 additions & 32 deletions .github/workflows/build-cli-latest.yml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---
name: Build API latest from main (or manually from a selected branch)
name: Build Lauth webapp
description: Builds the webapp (api and admin) from main or manually from a selected branch

on:
workflow_dispatch: # This allows to kick-off the action manually from GitHub Actions
Expand All @@ -11,22 +12,23 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v2
uses: actions/checkout@v4

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v3

- name: Login to GitHub Container Registry
uses: docker/login-action@v1
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build image and push to GitHub Container Registry
uses: docker/build-push-action@v2
uses: docker/build-push-action@v5
with:
context: .
push: true
tags: 'ghcr.io/mlibrary/lauth/lauth-api:${{ github.sha }}, ghcr.io/mlibrary/lauth/lauth-api:latest'
file: api/Dockerfile.prod
tags: 'ghcr.io/mlibrary/lauth/lauth:${{ github.sha }}, ghcr.io/mlibrary/lauth/lauth:latest'
file: lauth/Dockerfile
target: production
23 changes: 8 additions & 15 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,7 @@ jobs:
fail-fast: false
matrix:
suite:
# - 'api'
# - 'cli'
- 'app'
- 'test'
ruby:
- '3.2.2'
Expand All @@ -33,20 +32,14 @@ jobs:
echo "UID=$(id -u)" > .env
echo "GID=$(id -g)" >> .env
- if: matrix.suite == 'api'
- if: matrix.suite == 'app'
run: |
docker compose build --build-arg RUBY_VERSION=${{ matrix.ruby }} api
docker compose run api bundle exec rake db:migrate
docker compose run api bin/standardrb
docker compose run api bin/rspec
docker compose run api bin/cucumber
- if: matrix.suite == 'cli'
run: |
docker compose build --build-arg RUBY_VERSION=${{ matrix.ruby }} api cli
docker compose up -d api
docker compose exec api bundle exec rake db:migrate
docker compose run cli
docker compose build --build-arg RUBY_VERSION=${{ matrix.ruby }} app
# docker compose run app bundle exec rake db:migrate
# docker compose run app-dev bin/standardrb
docker compose run app-dev
# docker compose run api bin/cucumber
- if: matrix.suite == 'test'
run: |
docker compose build --build-arg RUBY_VERSION=${{ matrix.ruby }} api apache
docker compose build --build-arg RUBY_VERSION=${{ matrix.ruby }} app apache
docker compose run test
1 change: 0 additions & 1 deletion api/.envrc

This file was deleted.

35 changes: 0 additions & 35 deletions api/.gitignore

This file was deleted.

3 changes: 0 additions & 3 deletions api/.rspec

This file was deleted.

1 change: 0 additions & 1 deletion api/.ruby-version

This file was deleted.

3 changes: 0 additions & 3 deletions api/.standard.yml

This file was deleted.

36 changes: 0 additions & 36 deletions api/Dockerfile

This file was deleted.

37 changes: 0 additions & 37 deletions api/Dockerfile.prod

This file was deleted.

24 changes: 0 additions & 24 deletions api/Gemfile

This file was deleted.

Loading

0 comments on commit d8738c5

Please sign in to comment.