Skip to content

Commit

Permalink
[29] add params
Browse files Browse the repository at this point in the history
  • Loading branch information
meisnate12 committed May 29, 2024
1 parent 6b03ce7 commit 6bd98c3
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 40 deletions.
43 changes: 6 additions & 37 deletions .github/workflows/validate.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,49 +27,18 @@ jobs:
- name: Run Spellcheck
uses: rojopolis/spellcheck-github-actions@0.36.0

verify-changes:
docker-build:
runs-on: ubuntu-latest
needs: [ validate-pull ]
if: github.event.pull_request.head.repo.full_name == github.event.pull_request.base.repo.full_name && github.base_ref == 'nightly' && startswith(github.head_ref, 'docker-')
outputs:
build: ${{ steps.list-changes.outputs.build }}
tag: ${{ steps.create-tag.outputs.docker-tag }}
steps:

- name: Create Tag
id: create-tag
run: |
var="${{ github.head_ref }}"
echo "docker-tag=${var:7}" >> $GITHUB_OUTPUT
- name: Check Out Repo
uses: actions/checkout@v4
with:
fetch-depth: 0
ref: ${{ github.head_ref }}

- name: Get changes
id: get-changes
run: echo "files=$(git diff --name-only ${{ github.event.before }} ${{ github.event.after }} | xargs)" >> $GITHUB_OUTPUT

- name: List changed files
id: list-changes
run: |
for file in ${{ steps.get-changes.outputs.files }}; do
if [[ $file =~ ^(defaults|fonts|modules|kometa.py|requirements.txt|.dockerignore|Dockerfile).*$ ]] ; then
echo "$file will trigger docker build"
echo "build=true" >> $GITHUB_OUTPUT
else
echo "$file will not trigger docker build"
fi
done
docker-build:
runs-on: ubuntu-latest
needs: [ verify-changes ]
if: needs.verify-changes.outputs.build == 'true'
steps:

- name: Check Out Repo
uses: actions/checkout@v4
with:
Expand Down Expand Up @@ -97,10 +66,10 @@ jobs:
context: ./
file: ./Dockerfile
build-args: |
"BRANCH_NAME=${{ needs.verify-changes.outputs.tag }}"
"BRANCH_NAME=${{ steps.create-tag.outputs.docker-tag }}"
platforms: linux/amd64,linux/arm64
push: true
tags: kometateam/kometa:${{ needs.verify-changes.outputs.tag }}
tags: kometateam/kometa:${{ steps.create-tag.outputs.docker-tag }}
cache-from: type=gha
cache-to: type=gha,mode=max

Expand All @@ -109,7 +78,7 @@ jobs:
if: success()
with:
webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
title: "${{ vars.REPO_NAME }} ${{ needs.verify-changes.outputs.tag }}: ${{ vars.TEXT_SUCCESS }}"
title: "${{ vars.REPO_NAME }} ${{ steps.create-tag.outputs.docker-tag }}: ${{ vars.TEXT_SUCCESS }}"
url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }}
color: ${{ vars.COLOR_SUCCESS }}
username: ${{ vars.BOT_NAME }}
Expand All @@ -123,7 +92,7 @@ jobs:
with:
webhook_id_token: ${{ secrets.BUILD_WEBHOOK }}
message: ${{ vars.BUILD_FAILURE_ROLE }}
title: "${{ vars.REPO_NAME }} ${{ needs.verify-changes.outputs.tag }}: ${{ vars.TEXT_FAILURE }}"
title: "${{ vars.REPO_NAME }} ${{ steps.create-tag.outputs.docker-tag }}: ${{ vars.TEXT_FAILURE }}"
url: https://github.com/Kometa-Team/${{ vars.REPO_NAME }}/actions/runs/${{ github.run_id }}
color: ${{ vars.COLOR_FAILURE }}
username: ${{ vars.BOT_NAME }}
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.0.1-develop28
2.0.1-develop29
4 changes: 2 additions & 2 deletions modules/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ def download_image(self, title, image_url, download_directory, is_poster=True, f
def file_yaml(self, path_to_file, check_empty=False, create=False, start_empty=False):
return YAML(path=path_to_file, check_empty=check_empty, create=create, start_empty=start_empty)

def get_yaml(self, url, headers=None, check_empty=False):
response = self.get(url, headers=headers)
def get_yaml(self, url, headers=None, params=None, check_empty=False):
response = self.get(url, headers=headers, params=params)
if response.status_code >= 400:
raise Failed(f"URL Error: No file found at {url}")
return YAML(input_data=response.content, check_empty=check_empty)
Expand Down

0 comments on commit 6bd98c3

Please sign in to comment.