From 33a5988ef64aa2c37c3662bf6945929f7fdb591d Mon Sep 17 00:00:00 2001 From: Ethan Ruszanowski Date: Mon, 26 Feb 2024 16:46:22 -0500 Subject: [PATCH 1/2] Update workflows --- .../{build-and-push.yml => build-latest.yml} | 10 ++----- .github/workflows/build-release.yml | 28 +++++++++++++++++++ 2 files changed, 31 insertions(+), 7 deletions(-) rename .github/workflows/{build-and-push.yml => build-latest.yml} (79%) create mode 100644 .github/workflows/build-release.yml diff --git a/.github/workflows/build-and-push.yml b/.github/workflows/build-latest.yml similarity index 79% rename from .github/workflows/build-and-push.yml rename to .github/workflows/build-latest.yml index 2613158..8af0eea 100644 --- a/.github/workflows/build-and-push.yml +++ b/.github/workflows/build-latest.yml @@ -1,13 +1,11 @@ name: Build and Push to git.beans.team -on: +on: push: branches: - main - tags: - - '*' -jobs: +jobs: update-registry: name: Update Registry Image runs-on: ubuntu-latest @@ -28,6 +26,4 @@ jobs: context: . file: ./Dockerfile push: true - tags: | - git.beans.team/em/scouter:latest - git.beans.team/em/scouter:${{ github.sha }} + tags: git.beans.team/em/scouter:latest diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml new file mode 100644 index 0000000..39e899b --- /dev/null +++ b/.github/workflows/build-release.yml @@ -0,0 +1,28 @@ +name: Build and Push Releases + +on: + release: + types: [ published ] + +jobs: + update-registry: + name: Update Registry Image + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Login to git.beans.team + uses: docker/login-action@v3 + with: + registry: git.beans.team + username: em + password: ${{ secrets.REGISTRY_PASSWORD }} + + - name: Build and Push Image + uses: docker/build-push-action@v5 + with: + context: . + file: ./Dockerfile + push: true + tags: git.beans.team/em/scouter:${{ github.event.release.tag_name }} From c1121238d829db8e3c05176cd079737b83934177 Mon Sep 17 00:00:00 2001 From: Ethan Ruszanowski Date: Mon, 26 Feb 2024 16:53:48 -0500 Subject: [PATCH 2/2] Correct typo --- app.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.py b/app.py index 7b8536e..58700e2 100644 --- a/app.py +++ b/app.py @@ -141,7 +141,7 @@ def main(): st.write(find_spawnlist(run.outside_power, outside_creatures)) else: st.error( - f"Power level exceedes maximum possible for {run.moon.name}." + f"Power level exceeds maximum possible for {run.moon.name}." ) with right_column: @@ -180,7 +180,7 @@ def main(): st.write(find_spawnlist(run.inside_power, inside_creatures)) else: st.error( - f"Power level exceedes maximum possible for {run.moon.name}." + f"Power level exceeds maximum possible for {run.moon.name}." )