Skip to content

Commit

Permalink
Merge pull request #10 from ADACS-Australia/feature/docker
Browse files Browse the repository at this point in the history
Remove alpha channel from ADACS logo image and update actions.
  • Loading branch information
gbpoole authored Aug 9, 2024
2 parents ceb3baa + ce0f61f commit 5584995
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 27 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
steps:

- name: Check-out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:

# Set-up dependencies
- name: Check-out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # Needed for tags to be fetched; see https://github.com/actions/checkout/issues/290

Expand All @@ -73,7 +73,7 @@ jobs:
installer-parallel: true

- name: Set-up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'poetry'
Expand Down
21 changes: 2 additions & 19 deletions .github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,26 +51,9 @@ jobs:

steps:

# Clone the base template
- name: Clone base template
uses: actions/checkout@v3
with:
repository: 'ADACS-Australia/adacs_template_python_base'
path: __adacs_template_python_base

# Set the path where the base template will be stored and move it there
- name: Set temporary path
run: echo "TEMP_DIR=$(mktemp -d)" >> $GITHUB_ENV

- name: Move base template
run: mv __adacs_template_python_base $TEMP_DIR

- name: Set path to new base template location
run: echo "BASE_TEMPLATE_PATH=$(echo $TEMP_DIR/__adacs_template_python_base )" >> $GITHUB_ENV

# Set-up dependencies
- name: Check-out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # Needed for tags to be fetched; see https://github.com/actions/checkout/issues/290

Expand All @@ -90,7 +73,7 @@ jobs:
installer-parallel: true

- name: Set-up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'poetry'
Expand Down
Binary file modified docs/assets/adacs_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion {{cookiecutter.repo_name}}/.github/workflows/bump.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:

- name: Check-out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0

Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.repo_name}}/.github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

# Set-up dependencies
- name: Check-out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # Needed for tags to be fetched; see https://github.com/actions/checkout/issues/290

Expand All @@ -74,7 +74,7 @@ jobs:
installer-parallel: true

- name: Set-up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'poetry'
Expand Down
4 changes: 2 additions & 2 deletions {{cookiecutter.repo_name}}/.github/workflows/pull_request.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ jobs:

# Set-up dependencies
- name: Check-out repo
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0 # Needed for tags to be fetched; see https://github.com/actions/checkout/issues/290

Expand All @@ -74,7 +74,7 @@ jobs:
installer-parallel: true

- name: Set-up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: '3.11'
cache: 'poetry'
Expand Down

0 comments on commit 5584995

Please sign in to comment.