Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
h3mmy committed May 11, 2024
2 parents b9ffd88 + 687f94f commit fd45195
Show file tree
Hide file tree
Showing 26 changed files with 413 additions and 267 deletions.
9 changes: 5 additions & 4 deletions .github/actions/docker-image/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,12 @@ inputs:
required: true
push:
description: Push Images to GHCR
type: boolean
required: false
default: true
default: 'true'
latest:
description: Update latest tag
type: boolean
required: false
default: true
default: 'true'

runs:
using: composite
Expand All @@ -25,6 +23,8 @@ runs:
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}
labels: |
org.opencontainers.image.description=Bloopyboi Snapshot
flavor: |
latest=${{inputs.latest}}
tags: |
Expand Down Expand Up @@ -59,6 +59,7 @@ runs:
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
annotations: ${{ steps.meta.outputs.annotations }}
build-args: |
VERSION=${{ steps.meta.outputs.version }}
BUILDTIME=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/lint/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ runs:

# Run golangcilint before `go get` is ran
# https://github.com/golangci/golangci-lint-action/issues/23
- uses: golangci/golangci-lint-action@v4.0.0
- uses: golangci/golangci-lint-action@v5.3.0
with:
version: v1.55.1
args: --timeout 5m --config .github/lint/golangci.yaml
8 changes: 4 additions & 4 deletions .github/workflows/action-image-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
matrices: ${{ steps.generate-matrices.outputs.matrices }}
if: ${{ inputs.imagesToBuild != '' && inputs.imagesToBuild != '[]' }}
steps:
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4
with:
fetch-depth: 1

Expand Down Expand Up @@ -79,15 +79,15 @@ jobs:
cat << EOF
${{ toJSON(matrix.image) }}
EOF
- uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4
with:
fetch-depth: 1

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3

- name: Generate Token
uses: actions/create-github-app-token@v1.9.3
uses: actions/create-github-app-token@v1.10.0
id: generate-token
with:
app-id: "${{ secrets.APP_ID }}"
Expand Down Expand Up @@ -212,7 +212,7 @@ jobs:
uses: docker/setup-buildx-action@v3

- name: Generate Token
uses: actions/create-github-app-token@v1.9.3
uses: actions/create-github-app-token@v1.10.0
id: generate-token
with:
app-id: "${{ secrets.APP_ID }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/issue-project-sync.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Generate Token
uses: actions/create-github-app-token@v1.9.3
uses: actions/create-github-app-token@v1.10.0
id: generate-token
with:
app-id: "${{ secrets.APP_ID }}"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/meta-labeler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
configuration-path: .github/labeler.yaml

- name: Label Size
uses: pascalgn/size-label-action@v0.5.0
uses: pascalgn/size-label-action@v0.5.2
env:
GITHUB_TOKEN: "${{ steps.generate-token.outputs.token }}"
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/meta-sync-labels.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Generate Token
uses: actions/create-github-app-token@v1.9.3
uses: actions/create-github-app-token@v1.10.0
id: generate-token
with:
app-id: "${{ secrets.APP_ID }}"
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/on-merge-main.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Tests
uses: ./.github/actions/tests
Expand All @@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Lint
uses: ./.github/actions/lint
Expand All @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Build
uses: ./.github/actions/docker-image
Expand All @@ -42,10 +42,10 @@ jobs:
needs: tests
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Generate Token
uses: actions/create-github-app-token@v1.9.3
uses: actions/create-github-app-token@v1.10.0
id: generate-token
with:
app-id: "${{ secrets.APP_ID }}"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/on-pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4
- name: Lint
uses: ./.github/actions/lint

tests:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4
- name: Tests
uses: ./.github/actions/tests
2 changes: 1 addition & 1 deletion .github/workflows/pr-metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ jobs:
chartsToInstall: ${{ steps.changed-charts.outputs.chartsToInstall }}
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4
with:
fetch-depth: 0

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit-checks.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4

- name: Run against changes
uses: pre-commit/action@v3.0.1
Expand Down
142 changes: 56 additions & 86 deletions .github/workflows/publish-snapshot.yaml
Original file line number Diff line number Diff line change
@@ -1,87 +1,57 @@
---
name: Publish Snapshot

on:
push:
branches:
- dev
paths:
- 'go.mod'
- 'go.sum'
- '**.go'
- 'ent/**'
- '**.proto'
- 'Dockerfile'
- '.github/workflows/publish-snapshot.yaml'


jobs:
ent-ci:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
- name: Setup Go
uses: actions/setup-go@v5
with:
go-version-file: 'go.mod'
#- name: Verify ent files
# uses: ent/contrib/ci@master

tests:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Tests
uses: ./.github/actions/tests

lint:
permissions:
# Required: allow read access to the content for analysis.
contents: read
# Optional: allow read access to pull request. Use with `only-new-issues` option.
pull-requests: read
# Optional: Allow write access to checks to allow the action to annotate code in the PR.
checks: write
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Lint
uses: ./.github/actions/lint

release-image:
runs-on: ubuntu-latest
needs:
- tests
- lint
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build
uses: ./.github/actions/docker-image
with:
token: ${{ secrets.GITHUB_TOKEN }}

release-binaries:
runs-on: ubuntu-latest
needs: tests
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Generate Token
uses: actions/create-github-app-token@v1
id: generate-token
with:
app-id: "${{ secrets.APP_ID }}"
private-key: "${{ secrets.APP_PRIVATE_KEY }}"

- name: Release
uses: ./.github/actions/go-release
with:
token: "${{ steps.generate-token.outputs.token }}"
name: Publish Snapshot

on:
workflow_call:

jobs:
tests:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Tests
uses: ./.github/actions/tests

lint:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Lint
uses: ./.github/actions/lint

release-image:
runs-on: ubuntu-latest
needs:
- tests
- lint
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Build
uses: ./.github/actions/docker-image
with:
token: ${{ secrets.GITHUB_TOKEN }}

release-binaries:
runs-on: ubuntu-latest
needs: tests
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Generate Token
uses: actions/create-github-app-token@v1
id: generate-token
with:
app-id: "${{ secrets.APP_ID }}"
private-key: "${{ secrets.APP_PRIVATE_KEY }}"

- name: Release
uses: ./.github/actions/go-release
with:
token: "${{ steps.generate-token.outputs.token }}"
2 changes: 1 addition & 1 deletion .github/workflows/run-renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
token: "${{ steps.app-token.outputs.token }}"

- name: Renovate
uses: renovatebot/github-action@v40.1.9
uses: renovatebot/github-action@v40.1.11
env:
LOG_LEVEL: ${{ inputs.renovateLogLevel }}
RENOVATE_DRY_RUN: ${{ inputs.dryRun }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/schedule-broken-link-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,12 @@
private_key: "${{ secrets.APP_PRIVATE_KEY }}"

- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@44c2b7a8a4ea60a981eaca3cf939b5f4305c123b # v4.1.5
with:
token: "${{ steps.generate-token.outputs.token }}"

- name: Scan for broken links
uses: lycheeverse/lychee-action@c053181aa0c3d17606addfe97a9075a32723548a # v1.9.3
uses: lycheeverse/lychee-action@2b973e86fc7b1f6b36a93795fe2c9c6ae1118621 # v1.10.0
id: lychee
env:
GITHUB_TOKEN: "${{ steps.generate-token.outputs.token }}"
Expand Down
Loading

0 comments on commit fd45195

Please sign in to comment.