Skip to content
This repository was archived by the owner on Dec 6, 2024. It is now read-only.

Fix quoting disease label input when no disease id #182

Merged
merged 9 commits into from
Nov 8, 2023
78 changes: 78 additions & 0 deletions .github/workflows/build_docker_container.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,78 @@
name: build_container

on:
push:
branches:
- "dev"
- "main"
# workflow_call:
# inputs:
# git_tag:
# required: true
# type: string
# docker_container_uri_str_list:
# required: true
# type: string
# index_url: # Use test pypi index when downloading from dev
# required: true
# type: string

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
build_container:
runs-on: ubuntu-latest
steps:
# Checkout repo
- uses: actions/checkout@v4

# Extract branch name
- name: Extract branch name
id: get_branch_name
shell: bash
run: |
echo "branch_name=${GITHUB_REF#refs/heads/}" >> "${GITHUB_OUTPUT}"

# Get tag name
- name: Get Tag Name
id: get_tag_name
shell: bash
run: |
if [[ "${{ steps.get_branch_name.outputs.branch_name }}" == "main" ]]; then
echo "tag_name=latest" >> "${GITHUB_OUTPUT}"
else
echo "tag_name=dev" >> "${GITHUB_OUTPUT}"
fi

# Use qemu to perform multiplatform builds
- name: Set up QEMU
uses: docker/setup-qemu-action@v3

# Use docker buildx to build multi-platform containers
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
with:
use: true
install: true
config-inline: |
[worker.oci]
max-parallelism = 2

# Log in to GitHub Container registry
- name: Login to GitHub Container Registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ github.token }}

# Build and push docker images
- name: Build and Push Docker Image
uses: docker/build-push-action@v5
with:
context: ./
platforms: linux/amd64
push: true
tags: ghcr.io/umccr/cttso-ica-to-pieriandx:${{ steps.get_tag_name.outputs.tag_name }}
2 changes: 1 addition & 1 deletion .github/workflows/check_changelog.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Create and Upload Release And Docker Container(s)
name: Check Changelog

on:
pull_request:
Expand Down
16 changes: 16 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,22 @@ Changes in this log refer only to changes that make it to the 'main' branch. and

For changes in deployment, please see the [deployment changelog](deploy/cttso-ica-to-pieriandx-cdk/Changelog.md)

## 2023-11-08

> Author: Alexis Lucattini
> Email: [[email protected]](mailto:[email protected])

### Enhancements

* Build containers with ghcr.io (yet to move)
* Dont build containers concurrently (https://github.com/umccr/cttso-ica-to-pieriandx/pull/181)
* Resolves https://github.com/umccr/cttso-ica-to-pieriandx/issues/180

### Hotfixes

* Quote label input when no disease id (https://github.com/umccr/cttso-ica-to-pieriandx/pull/179)
* Resolves https://github.com/umccr/cttso-ica-to-pieriandx/issues/176

## 2023-11-07

> Author: Alexis Lucattini
Expand Down
2 changes: 1 addition & 1 deletion utils/micro_classes.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def get_code_from_label(self):
:return:
"""
try:
return self.REFERENCE_DF.query(f"Label=={self.label}")['Code'].item()
return self.REFERENCE_DF.query(f"Label=='{self.label}'")['Code'].item()
except ValueError:
logger.error(f"Could not find unique label {self.label} in the csv")
raise ValueError
Expand Down