Skip to content

Commit

Permalink
Merge pull request #31 from osiastedian/v1
Browse files Browse the repository at this point in the history
V1 merge
  • Loading branch information
osiastedian authored Dec 4, 2023
2 parents a3babab + 2fb02b4 commit 18f6757
Show file tree
Hide file tree
Showing 17 changed files with 6,180 additions and 410 deletions.
26 changes: 23 additions & 3 deletions .github/workflows/ghcr-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
push:
branches:
- 'main'
- 'v1'

jobs:
docker:
Expand All @@ -15,6 +16,23 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

-
name: Docker meta
id: meta
uses: docker/metadata-action@v4
with:
# list of Docker images to use as base name for tags
images: |
ghcr.io/osiastedian/syscoin-tipbot
# generate Docker tags based on the following events/attributes
tags: |
type=schedule
type=ref,event=branch
type=ref,event=pr
type=semver,pattern={{version}}
type=semver,pattern={{major}}.{{minor}}
type=semver,pattern={{major}}
type=sha
-
name: Login to GitHub Container Registry
uses: docker/login-action@v2
Expand All @@ -23,8 +41,10 @@ jobs:
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Build and push
-
name: Build and push
uses: docker/build-push-action@v4
with:
push: true
tags: ghcr.io/osiastedian/syscoin-tipbot:latest
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
5 changes: 4 additions & 1 deletion auctions.js
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,10 @@ exports.endingSoon = async function(message, client) {
}
} catch (error) {
console.log(error)
message.channel.send({embed: { color: c.FAIL_COL, description: `Error finding auctions.`}})
if(message) {
message.channel.send({embed: { color: c.FAIL_COL, description: `Error finding auctions.`}})
}

}
}

Expand Down
Loading

0 comments on commit 18f6757

Please sign in to comment.