Skip to content

Commit

Permalink
Merge branch 'main' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
lewisl9029 committed Sep 18, 2024
2 parents ad1d670 + 49ff471 commit 3ae2c83
Show file tree
Hide file tree
Showing 1,307 changed files with 28,601 additions and 39,572 deletions.
655 changes: 280 additions & 375 deletions .all-contributorsrc

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions .changeset/shiny-oranges-tap.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
---
'@highlight-run/cloudflare': patch
'@highlight-run/remix': patch
'@highlight-run/next': patch
'@highlight-run/node': patch
---

fix opentelemetry warning from missing dependencies
2 changes: 1 addition & 1 deletion .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
- name: Check for logrus without context
run: if [ "$(grep --exclude-dir migrations --exclude main.go --exclude recovery.go --exclude logging.go -rE '\s+log\.(Debug|Info|Warn|Error|Fatal)' ./backend | grep -v 'WithContext' | grep -v 'Level' | wc -l)" -gt 0 ]; then grep --exclude-dir migrations --exclude main.go --exclude recovery.go --exclude logging.go -rE '\s+log\.(Debug|Info|Warn|Error|Fatal)' ./backend | grep -v 'WithContext' | grep -v 'Level' && exit 1; fi
- name: Run linter
uses: golangci/golangci-lint-action@v4
uses: golangci/golangci-lint-action@v6
with:
args: -v --config ./.golangci.yml
working-directory: backend
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ jobs:
container: ['frontend', 'backend']
runs-on: buildjet-4vcpu-ubuntu-2204
timeout-minutes: 30
# does not work for open source builds as doppler is required
if: github.event.pull_request.head.repo.full_name == 'highlight/highlight' || github.ref == 'refs/heads/main' || github.event_name == 'release'
env:
IMAGE_NAME: highlight-${{ matrix.container }}
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
Expand All @@ -28,14 +30,12 @@ jobs:
submodules: recursive

- name: Login to Docker Hub
if: github.event.pull_request.head.repo.full_name == 'highlight/highlight' || github.ref == 'refs/heads/main' || github.event_name == 'release'
uses: docker/login-action@v3
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}

- name: Login to GitHub Docker
if: github.event.pull_request.head.repo.full_name == 'highlight/highlight' || github.ref == 'refs/heads/main' || github.event_name == 'release'
uses: docker/login-action@v3
with:
registry: ghcr.io
Expand Down
72 changes: 72 additions & 0 deletions .github/workflows/dotnet.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
name: .NET SDK

on:
push:
branches: ['main']
pull_request:
types: [opened, synchronize]
paths:
- 'sdk/highlight-dotnet/**'
- 'sdk/highlight-dotnet4/**'
- '.github/workflows/dotnet.yml'

concurrency: ${{ github.workflow }}-${{ github.ref }}
jobs:
build-dotnet:
name: ASP.NET Core SDK
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./sdk/highlight-dotnet
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup .NET environment
uses: actions/setup-dotnet@v4
with:
dotnet-version: 8.x

- name: Build solution and generate NuGet package
run: dotnet pack -c Release -o out

- name: Push generated package to NuGet registry
if: github.ref == 'refs/heads/main'
run: dotnet nuget push out/*.nupkg -k $NUGET_AUTH_TOKEN -s https://api.nuget.org/v3/index.json
env:
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }}

build-dotnet4:
name: ASP.NET4 SDK
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./sdk/highlight-dotnet4
steps:
- name: Checkout
uses: actions/checkout@v4
with:
submodules: recursive

- name: Setup .NET environment
run: |
sudo gpg --homedir /tmp --no-default-keyring --keyring /usr/share/keyrings/mono-official-archive-keyring.gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
echo "deb [signed-by=/usr/share/keyrings/mono-official-archive-keyring.gpg] https://download.mono-project.com/repo/ubuntu stable-focal main" | sudo tee /etc/apt/sources.list.d/mono-official-stable.list
sudo apt update && sudo apt install -y mono-complete mono-xsp4 nuget
- name: NuGet Restore
run: nuget restore

- name: Build
run: xbuild

- name: Build solution and generate NuGet package
run: nuget pack

- name: Push generated package to NuGet registry
if: github.ref == 'refs/heads/main'
run: nuget push *.nupkg -ApiKey $NUGET_AUTH_TOKEN -Source https://api.nuget.org/v3/index.json
env:
NUGET_AUTH_TOKEN: ${{ secrets.NUGET_API_KEY }}
Loading

0 comments on commit 3ae2c83

Please sign in to comment.