Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: do not bundle config vars to allow changing with docker env #1068

Closed
wants to merge 20 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 0 additions & 5 deletions .changeset/calm-points-jump.md

This file was deleted.

15 changes: 7 additions & 8 deletions .changeset/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,17 @@
"changelog": [
"@changesets/changelog-github",
{
"repo": "lagonapp/lagon"
"repo": "lagossapp/lagoss"
}
],
"commit": false,
"fixed": [
[
"@lagon/runtime",
"@lagon/js-runtime"
]
],
"fixed": [["@lagoss/runtime", "@lagoss/js-runtime"]],
"linked": [],
"access": "public",
"baseBranch": "main",
"updateInternalDependencies": "patch"
"updateInternalDependencies": "patch",
"privatePackages": {
"version": true,
"tag": true
}
}
5 changes: 5 additions & 0 deletions .changeset/new-snakes-leave.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@lagoss/dashboard': minor
---

do not bundle config vars to allow changing with docker env
5 changes: 0 additions & 5 deletions .changeset/ninety-kids-notice.md

This file was deleted.

5 changes: 5 additions & 0 deletions .changeset/purple-rice-suffer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@lagoss/ui': minor
---

Updated docs to vitepress, added self-hosting instructions and adjusted README
5 changes: 0 additions & 5 deletions .changeset/shiny-plums-yell.md

This file was deleted.

1 change: 0 additions & 1 deletion .github/FUNDING.yml

This file was deleted.

18 changes: 4 additions & 14 deletions .github/workflows/container.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,10 @@ on:
branches:
- main
tags:
- '@lagon/serverless@*'
- '@lagoss/serverless@*'
- '@lagoss/dashboard@*'
pull_request:

env:
DOCKER_HUB_USER: lagonapp

jobs:
create-container-image:
name: Create "${{matrix.image}}" container image
Expand All @@ -35,28 +33,20 @@ jobs:
uses: docker/metadata-action@v4
with:
images: |
${{ env.DOCKER_HUB_USER }}/${{matrix.image}}
ghcr.io/${{ github.repository_owner }}/${{matrix.image}}
tags: |
type=ref,event=tag,prefix=@lagon/${{matrix.image}}@
type=ref,event=tag,prefix=@lagoss/${{matrix.image}}@
type=ref,event=pr
type=raw,value=next,enable={{is_default_branch}}

- name: Login to ghcr.io registry
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Login to Docker Hub
if: github.event_name != 'pull_request'
uses: docker/login-action@v2
with:
username: ${{ env.DOCKER_HUB_USER }}
password: ${{ secrets.DOCKER_HUB_TOKEN }}

- name: Build and push
uses: docker/build-push-action@v4
if: "!startsWith(github.ref, 'refs/tags/') || contains(github.ref, matrix.image)" # only execute if not tag or tag with specific matrix image
Expand Down
42 changes: 23 additions & 19 deletions .github/workflows/cd.yml → .github/workflows/release-cli.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
name: CD
name: Release cli

on:
push:
tags:
- '@lagon/cli@*'
- '@lagoss/cli@*'
workflow_dispatch:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

jobs:
artifacts:
release-cli:
name: Create Artifact ${{ matrix.target }} (${{ matrix.os }})
runs-on: ${{ matrix.os }}
strategy:
Expand All @@ -20,29 +24,29 @@ jobs:
include:
- os: ubuntu-20.04
target: x86_64-unknown-linux-gnu
asset_name: lagon-linux-x64
input: lagon-cli
output: lagon
asset_name: lagoss-linux-x64
input: lagoss-cli
output: lagoss
- os: ubuntu-20.04
target: aarch64-unknown-linux-gnu
asset_name: lagon-linux-arm64
input: lagon-cli
output: lagon
asset_name: lagoss-linux-arm64
input: lagoss-cli
output: lagoss
- os: macOS-latest
target: x86_64-apple-darwin
asset_name: lagon-darwin-x64
input: lagon-cli
output: lagon
asset_name: lagoss-darwin-x64
input: lagoss-cli
output: lagoss
- os: macOS-latest
target: aarch64-apple-darwin
asset_name: lagon-darwin-arm64
input: lagon-cli
output: lagon
asset_name: lagoss-darwin-arm64
input: lagoss-cli
output: lagoss
- os: windows-2019
target: x86_64-pc-windows-msvc
asset_name: lagon-win-x64
input: lagon-cli.exe
output: lagon.exe
asset_name: lagoss-win-x64
input: lagoss-cli.exe
output: lagoss.exe
steps:
- uses: actions/checkout@v3
with:
Expand Down Expand Up @@ -74,7 +78,7 @@ jobs:
- name: Install dependencies
run: pnpm install
- name: Build js-runtime
run: pnpm turbo build --filter=@lagon/js-runtime
run: pnpm turbo build --filter=@lagoss/js-runtime
- name: Build CLI
run: |
cd crates/cli && cargo build --release --target ${{ matrix.target }}
Expand Down
6 changes: 6 additions & 0 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
name: Release

on:
push:
branches:
- main

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

jobs:
release:
name: Release
Expand All @@ -34,6 +38,8 @@ jobs:
title: 'ci: release'
publish: pnpm release
env:
# secrets.GITHUB_TOKEN doesn't trigger workflow on automated release
# https://github.com/orgs/community/discussions/26875
GITHUB_TOKEN: ${{ secrets.PAT }}
NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
NPM_CONFIG_PROVENANCE: true
12 changes: 8 additions & 4 deletions .github/workflows/ci.yml → .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: CI
name: Test

on:
push:
branches:
- main
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

jobs:
lint:
name: Lint
Expand All @@ -31,6 +32,7 @@ jobs:
run: pnpm install
- name: Lint
run: pnpm lint

test:
name: Test
runs-on: ubuntu-20.04
Expand All @@ -53,6 +55,7 @@ jobs:
run: pnpm install
- name: Test
run: pnpm test

typecheck:
name: Typecheck
runs-on: ubuntu-20.04
Expand All @@ -70,6 +73,7 @@ jobs:
run: pnpm install
- name: Typecheck
run: pnpm typecheck

build:
name: Build
runs-on: ubuntu-20.04
Expand Down
9 changes: 5 additions & 4 deletions .github/workflows/wpt.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
name: web-platform-tests

on:
push:
branches:
- main
pull_request:

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

env:
TURBO_TOKEN: ${{ secrets.TURBO_TOKEN }}
TURBO_TEAM: ${{ secrets.TURBO_TEAM }}

jobs:
wpt:
name: web-platform-tests
Expand All @@ -28,7 +29,7 @@ jobs:
- name: Install dependencies
run: pnpm install
- name: Build runtime
run: pnpm turbo build --filter=@lagon/js-runtime
run: pnpm turbo build --filter=@lagoss/js-runtime
- name: Run wpt-runner
run: cd crates/wpt-runner && pnpm start
- name: Check if results have changed
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ node_modules/
dist/
build/
coverage/
.lagon/
.lagoss/
.turbo/
.cache/
ssl/
Expand Down
3 changes: 1 addition & 2 deletions CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,7 @@ representative at an online or offline event.
## Enforcement

Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported to the community leaders responsible for enforcement at
[email protected].
reported to the community leaders responsible for enforcement at lagoss[at]ju60.de.
All complaints will be reviewed and investigated promptly and fairly.

All community leaders are obligated to respect the privacy and security of the
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
## Contributing

[See the contributing guide on the documentation](https://docs.lagon.app/contributing)
[See the contributing guide on the documentation](https://docs.lagoss.com/contributing)
Loading
Loading