-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ci: Another attemnpt to fix the build
- Loading branch information
Alan Christie
committed
Nov 11, 2023
1 parent
fc5f728
commit 42749ba
Showing
3 changed files
with
76 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -49,7 +49,32 @@ env: | |
STACK_NAMESPACE: xchem | ||
|
||
jobs: | ||
build: | ||
prepare: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
- name: Lint Dockerfile | ||
uses: hadolint/[email protected] | ||
with: | ||
dockerfile: Dockerfile | ||
- name: Set up Python | ||
uses: actions/setup-python@v3 | ||
with: | ||
python-version: '3.11' | ||
- name: Compile requirements.txt | ||
run: | | ||
pip install --upgrade pip | ||
pip install poetry==1.7.0 | ||
poetry export --without-hashes --without dev --output requirements.txt | ||
- name: Upload compiled requirements | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: requirements | ||
path: requirements.txt | ||
|
||
build-and-push: | ||
needs: prepare | ||
runs-on: ubuntu-latest | ||
outputs: | ||
push: ${{ steps.vars.outputs.push }} | ||
|
@@ -113,30 +138,18 @@ jobs: | |
# Do we trigger downstream, i.e. is TRIGGER_DOWNSTREAM 'yes'? | ||
echo trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }} | ||
echo "trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }}" >> $GITHUB_OUTPUT | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
- name: Lint Dockerfile | ||
uses: hadolint/[email protected] | ||
with: | ||
dockerfile: Dockerfile | ||
- name: Set up Python | ||
uses: actions/setup-python@v3 | ||
- name: Download requirements | ||
uses: actions/download-artifact@v3 | ||
with: | ||
python-version: '3.10' | ||
- name: Compile requirements.txt | ||
run: | | ||
pip install --upgrade pip | ||
pip install poetry==1.5.1 | ||
poetry export --without-hashes --without dev --output requirements.txt | ||
name: requirements | ||
- name: Build | ||
uses: docker/build-push-action@v4 | ||
with: | ||
context: . | ||
tags: | | ||
${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:${{ steps.vars.outputs.tag }} | ||
${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:stable | ||
- name: Test | ||
# - name: Test | ||
run: > | ||
docker-compose -f docker-compose.test.yml up | ||
--build | ||
|
@@ -145,12 +158,12 @@ jobs: | |
env: | ||
BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }} | ||
BE_TAG: ${{ steps.vars.outputs.tag }} | ||
- name: Login to DockerHub | ||
if: steps.vars.outputs.push == 'true' | ||
uses: docker/login-action@v2 | ||
with: | ||
username: ${{ secrets.DOCKERHUB_USERNAME }} | ||
password: ${{ secrets.DOCKERHUB_TOKEN }} | ||
# - name: Login to DockerHub | ||
# if: steps.vars.outputs.push == 'true' | ||
# uses: docker/login-action@v2 | ||
# with: | ||
# username: ${{ secrets.DOCKERHUB_USERNAME }} | ||
# password: ${{ secrets.DOCKERHUB_TOKEN }} | ||
- name: Push | ||
if: steps.vars.outputs.push == 'true' | ||
run: | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -71,7 +71,32 @@ env: | |
STACK_NAMESPACE: xchem | ||
|
||
jobs: | ||
build: | ||
prepare: | ||
runs-on: ubuntu-latest | ||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
- name: Lint Dockerfile | ||
uses: hadolint/[email protected] | ||
with: | ||
dockerfile: Dockerfile | ||
- name: Set up Python | ||
uses: actions/setup-python@v3 | ||
with: | ||
python-version: '3.11' | ||
- name: Compile requirements.txt | ||
run: | | ||
pip install --upgrade pip | ||
pip install poetry==1.7.0 | ||
poetry export --without-hashes --without dev --output requirements.txt | ||
- name: Upload compiled requirements | ||
uses: actions/upload-artifact@v3 | ||
with: | ||
name: requirements | ||
path: requirements.txt | ||
|
||
build-and-push: | ||
needs: prepare | ||
runs-on: ubuntu-latest | ||
outputs: | ||
push: ${{ steps.vars.outputs.push }} | ||
|
@@ -135,35 +160,23 @@ jobs: | |
# Do we trigger downstream, i.e. is TRIGGER_DOWNSTREAM 'yes'? | ||
echo trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }} | ||
echo "trigger=${{ env.TRIGGER_DOWNSTREAM == 'yes' }}" >> $GITHUB_OUTPUT | ||
- name: Checkout | ||
uses: actions/checkout@v3 | ||
- name: Lint Dockerfile | ||
uses: hadolint/[email protected] | ||
- name: Download requirements | ||
uses: actions/download-artifact@v3 | ||
with: | ||
dockerfile: Dockerfile | ||
- name: Set up Python | ||
uses: actions/setup-python@v3 | ||
with: | ||
python-version: '3.10' | ||
- name: Compile requirements.txt | ||
run: | | ||
pip install --upgrade pip | ||
pip install poetry==1.5.1 | ||
poetry export --without-hashes --without dev --output requirements.txt | ||
name: requirements | ||
- name: Build | ||
uses: docker/build-push-action@v4 | ||
with: | ||
tags: ${{ steps.vars.outputs.BE_NAMESPACE }}/fragalysis-backend:${{ steps.vars.outputs.tag }} | ||
- name: Test | ||
run: > | ||
docker-compose -f docker-compose.test.yml up | ||
--build | ||
--exit-code-from tests | ||
--abort-on-container-exit | ||
env: | ||
BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }} | ||
BE_TAG: ${{ steps.vars.outputs.tag }} | ||
# - name: Test | ||
# run: > | ||
# docker-compose -f docker-compose.test.yml up | ||
# --build | ||
# --exit-code-from tests | ||
# --abort-on-container-exit | ||
# env: | ||
# BE_NAMESPACE: ${{ steps.vars.outputs.BE_NAMESPACE }} | ||
# BE_TAG: ${{ steps.vars.outputs.tag }} | ||
- name: Login to DockerHub | ||
if: steps.vars.outputs.push == 'true' | ||
uses: docker/login-action@v2 | ||
|