Skip to content

Commit

Permalink
NRL-817 No cache needed for asdf
Browse files Browse the repository at this point in the history
  • Loading branch information
axelkrastek1-nhs committed Jul 2, 2024
1 parent a4294b2 commit 27763a2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 44 deletions.
35 changes: 2 additions & 33 deletions .github/workflows/pr-env-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,21 +50,8 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref }}

- name: Do asdf magic
run: |
rm -rf ~/.asdf1
git clone --depth 1 --branch master --single-branch https://github.com/asdf-vm/asdf.git ~/.asdf1
export ASDF_DIR="$HOME/.asdf1"
. "$HOME/.asdf/asdf.sh"
make asdf-install
- name: Setup asdf cache
uses: actions/cache@v4
with:
path: |
~/.asdf1/plugins
~/.asdf1/installs
key: ${{ runner.os }}-asdfquick3-${{ hashFiles('**/.tool-versions') }}
- name: Install asdf
uses: asdf-vm/actions/[email protected]

- name: Install zip
run: sudo apt-get install zip
Expand Down Expand Up @@ -132,12 +119,6 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref }}

- name: Setup asdf cache
uses: actions/cache@v4
with:
path: ~/.asdf
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}

- name: Install asdf
uses: asdf-vm/actions/[email protected]

Expand Down Expand Up @@ -213,12 +194,6 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref }}

- name: Setup asdf cache
uses: actions/cache@v4
with:
path: ~/.asdf
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}

- name: Install asdf and tools
uses: asdf-vm/actions/[email protected]

Expand Down Expand Up @@ -259,12 +234,6 @@ jobs:
with:
ref: ${{ github.event.pull_request.head.ref }}

- name: Setup asdf cache
uses: actions/cache@v4
with:
path: ~/.asdf
key: ${{ runner.os }}-asdf-${{ hashFiles('**/.tool-versions') }}

- name: Install asdf and tools
uses: asdf-vm/actions/[email protected]

Expand Down
1 change: 0 additions & 1 deletion tests/features/steps/2_request.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from behave import * # noqa
from behave.runner import Context

from utils.api_client import ConsumerClient, ProducerClient
from utils.data import (
create_test_document_reference,
Expand Down
21 changes: 11 additions & 10 deletions tests/features/utils/data.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
from nrlf.producer.fhir.r4.model import (
Attachment,
CodeableConcept,
Coding,
DocumentReference,
DocumentReferenceContent,
DocumentReferenceRelatesTo,
Identifier,
Reference,
)
from utils.constants import (
DEFAULT_TEST_AUTHOR,
DEFAULT_TEST_CATEGORY,
Expand All @@ -21,6 +11,17 @@
DEFAULT_TEST_TYPE,
)

from nrlf.producer.fhir.r4.model import (
Attachment,
CodeableConcept,
Coding,
DocumentReference,
DocumentReferenceContent,
DocumentReferenceRelatesTo,
Identifier,
Reference,
)


def create_test_document_reference(items: dict) -> DocumentReference:
base_doc_ref = DocumentReference(
Expand Down

0 comments on commit 27763a2

Please sign in to comment.