Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Deprecate app public pages #549

Merged
merged 26 commits into from
Mar 14, 2024
Merged
Show file tree
Hide file tree
Changes from 23 commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
df28043
Deprecate app public pages
ja573 Feb 7, 2024
2f6cbbe
Update changelog
ja573 Feb 7, 2024
45e6303
Build and push staging images
ja573 Feb 7, 2024
5e45006
Update changelog
ja573 Feb 7, 2024
2928876
Build and push staging images
ja573 Feb 7, 2024
fec8202
Add event type
ja573 Feb 7, 2024
d2fa6b2
Upgrade docker github actions
ja573 Feb 8, 2024
7bb8115
Update changelog
ja573 Feb 8, 2024
98a93df
Update changelog
ja573 Feb 8, 2024
48f9c85
Merge branch 'develop' into feature/deprecate_website
ja573 Feb 12, 2024
7b3f71a
Upgrade checkout action to v4
ja573 Feb 14, 2024
c6f5627
Update changelog
ja573 Feb 14, 2024
ff0e31e
Upgrade setup-node action to v4
ja573 Feb 14, 2024
4522033
Update changelog
ja573 Feb 14, 2024
308fd90
Merge branch 'develop' into feature/deprecate_website
ja573 Feb 14, 2024
630f51c
Merge branch 'develop' into feature/deprecate_website
ja573 Feb 19, 2024
8a77264
Merge branch 'develop' into feature/deprecate_website
ja573 Feb 27, 2024
4334d85
Merge branch 'develop' into feature/deprecate_website
ja573 Feb 29, 2024
3662332
Change assets path
ja573 Feb 29, 2024
fa83bb9
Remove redundant assets
ja573 Feb 29, 2024
074165d
Deprecate trait
ja573 Feb 29, 2024
98ee45b
Remove redundant assets
ja573 Feb 29, 2024
0b7465b
Remove redundant impot
ja573 Feb 29, 2024
d675259
Merge branch 'develop' into feature/deprecate_website
ja573 Mar 6, 2024
b0dd0b9
Merge branch 'develop' into feature/deprecate_website
ja573 Mar 14, 2024
dd79ec8
Remove actions-rs based actions
ja573 Mar 14, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 22 additions & 22 deletions .github/workflows/build_test_and_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,39 +32,39 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Build binary
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose
- uses: actions/checkout@v4
- name: Build binary
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run tests
uses: actions-rs/cargo@v1
with:
command: test
args: --workspace --verbose
- uses: actions/checkout@v4
- name: Run tests
uses: actions-rs/cargo@v1
with:
command: test
args: --workspace --verbose
lint:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Run linting
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all --all-targets --all-features -- -D warnings
- uses: actions/checkout@v4
- name: Run linting
uses: actions-rs/cargo@v1
with:
command: clippy
args: --all --all-targets --all-features -- -D warnings
format_check:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: rustfmt
override: true
toolchain: stable
components: rustfmt
override: true
- name: Run format
uses: actions-rs/cargo@v1
with:
Expand Down
30 changes: 0 additions & 30 deletions .github/workflows/docker_build.yml

This file was deleted.

40 changes: 29 additions & 11 deletions .github/workflows/docker_build_and_push_to_dockerhub.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
name: publish-to-dockerhub

on:
release:
types: [published]
pull_request:
workflow_dispatch:

jobs:
build_and_push_docker_image:
build_and_push_staging_docker_image:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
Expand All @@ -19,21 +19,19 @@ jobs:
openbookpublishers/thoth
# generate Docker tags based on the following events/attributes
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=ref,event=pr,prefix=staging-pr-
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v3
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
Expand All @@ -43,3 +41,23 @@ jobs:
THOTH_EXPORT_API=https://export.thoth.pub
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}

build_dev_docker_image:
runs-on: ubuntu-latest
steps:
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Build
id: docker_build
uses: docker/build-push-action@v5
with:
push: false
tags: openbookpublishers/thoth:latest
file: Dockerfile.dev
build-args: |
THOTH_GRAPHQL_API=https://api.thoth.pub
THOTH_EXPORT_API=https://export.thoth.pub
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
45 changes: 45 additions & 0 deletions .github/workflows/docker_build_and_push_to_dockerhub_release.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: publish-to-dockerhub

on:
release:
types: [published]

jobs:
build_and_push_docker_image:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
# list of Docker images to use as base name for tags
images: |
openbookpublishers/thoth
# generate Docker tags based on the following events/attributes
tags: |
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
- name: Login to DockerHub
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push
id: docker_build
uses: docker/build-push-action@v5
with:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
build-args: |
THOTH_GRAPHQL_API=https://api.thoth.pub
THOTH_EXPORT_API=https://export.thoth.pub
- name: Image digest
run: echo ${{ steps.docker_build.outputs.digest }}
34 changes: 0 additions & 34 deletions .github/workflows/docker_build_dev.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/docker_build_dev_no_action.yml

This file was deleted.

12 changes: 0 additions & 12 deletions .github/workflows/docker_build_no_action.yml

This file was deleted.

32 changes: 16 additions & 16 deletions .github/workflows/run_migrations.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,19 +40,19 @@ jobs:
ports:
- 5432:5432
steps:
- uses: actions/checkout@v3
- name: Build binary
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose
- name: Run migrations
uses: actions-rs/cargo@v1
with:
command: run
args: migrate
- name: Revert migrations
uses: actions-rs/cargo@v1
with:
command: run
args: migrate --revert
- uses: actions/checkout@v4
- name: Build binary
uses: actions-rs/cargo@v1
with:
command: build
args: --verbose
- name: Run migrations
uses: actions-rs/cargo@v1
with:
command: run
args: migrate
- name: Revert migrations
uses: actions-rs/cargo@v1
with:
command: run
args: migrate --revert
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]
### Removed
- [549](https://github.com/thoth-pub/thoth/pull/549) - Deprecate public-facing pages in Thoth APP in favour of a separate, standalone, website

### Added
- [549](https://github.com/thoth-pub/thoth/pull/549) - Build and push staging docker images on pull requests

### Changed
- [549](https://github.com/thoth-pub/thoth/pull/549) - Upgrade GitHub actions dependencies (`docker/setup-qemu-action@v3`, `docker/setup-buildx-action@v3`, `docker/login-action@v3`, `docker/build-push-action@v5`, `actions/checkout@v4`, `actions/setup-node@v4`)

## [[0.11.17]](https://github.com/thoth-pub/thoth/releases/tag/v0.11.17) - 2024-02-29
### Changed
Expand Down
Loading
Loading