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

[WIP] Promote experimental changes #290

Merged
merged 13 commits into from
Mar 19, 2024
Merged
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
  •  
  •  
  •  
1 change: 1 addition & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
// TODO: Update this config... https://typescript-eslint.io/blog/announcing-typescript-eslint-v6/
// TODO: Please I already forgot :sob:
module.exports = {
env: {
browser: true,
Expand Down
7 changes: 6 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@
*.sql linguist-detectable=false

# I don't want docs website to be included in language stats
docs/** linguist-vendored
docs/** linguist-vendored

# Ignore all snapshots and test files
**/__snapshots__/** linguist-vendored
**/*.test.ts linguist-vendored
**/*.test.tsx linguist-vendored
3 changes: 2 additions & 1 deletion .github/actions/build-docker/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,14 +71,15 @@ runs:
context: .
build-args: |
"GIT_REV=${{ env.GIT_REV }}"
"TAGS=${{ env.TAGS }}"
file: docker/Dockerfile
platforms: ${{ inputs.platforms }}
load: ${{ inputs.load }}
push: ${{ inputs.push }}
tags: ${{ env.TAGS }}

- name: Discord notification
if: ${{ success() && inputs.push == 'true' }}
if: ${{ success() && inputs.push == 'true' && inputs.discord-webhook != '' }}
env:
DISCORD_WEBHOOK: ${{ inputs.discord-webhook }}
uses: 'Ilshidur/action-discord@0.3.2'
Expand Down
22 changes: 18 additions & 4 deletions .github/actions/build-web/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,31 @@ runs:
- name: Checkout project
uses: actions/checkout@v3

- name: Setup pnpm
uses: ./.github/actions/setup-pnpm
- uses: actions/setup-node@v4
with:
node-version: '20.0.0'

- name: Install yarn
shell: bash
run: npm install -g yarn

- uses: actions/setup-node@v4
with:
node-version: '20.0.0'
cache: 'yarn'

- name: Install yarn
shell: bash
run: npm install -g yarn

- name: Install dependencies
shell: bash
run: pnpm install
run: yarn install
working-directory: apps/web

- name: Build app
shell: bash
run: pnpm run build
run: yarn build
working-directory: apps/web

- name: Upload bundle
Expand Down
30 changes: 0 additions & 30 deletions .github/actions/setup-pnpm/action.yaml

This file was deleted.

2 changes: 0 additions & 2 deletions .github/workflows/build_nix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,3 @@ jobs:
- uses: cachix/install-nix-action@v17
- name: test
run: nix develop --command "pkg-config" "--libs" "--cflags" "gdk-3.0" "gdk-3.0 >= 3.22"
# - name: Building package
# run: nix develop --command pnpm core run setup && cargo check
19 changes: 16 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,21 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup PNPM and TypeScript
uses: ./.github/actions/setup-pnpm
- uses: actions/setup-node@v4
with:
node-version: '20.0.0'

- name: Install yarn
shell: bash
run: npm install -g yarn

- uses: actions/setup-node@v4
with:
node-version: '20.0.0'
cache: 'yarn'

- name: Install dependencies
run: yarn install

- name: Run TypeScript lints
run: pnpm lint
run: yarn lint
37 changes: 37 additions & 0 deletions .github/workflows/experimental.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: 'Stump Experimental CI'

on:
pull_request:
branches:
- experimental
push:
branches:
- experimental

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

env:
DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKERHUB_TOKEN }}

jobs:
nightly-docker-build:
name: Build docker image
runs-on: [ubuntu-22.04]
steps:
- name: Checkout repository
uses: actions/checkout@v3

- name: Setup and build docker image
uses: ./.github/actions/build-docker
with:
username: ${{ env.DOCKER_USERNAME }}
password: ${{ env.DOCKER_PASSWORD }}
tags: 'experimental'
load: ${{ github.event_name == 'pull_request' }}
push: ${{ github.event_name == 'push' }}
platforms: 'linux/amd64'
# platforms: 'linux/arm64/v8,linux/arm/v7,linux/amd64'
discord-webhook: ${{ secrets.DISCORD_WEBHOOK }}
8 changes: 1 addition & 7 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
# OS
.DS_Store

# Logs
logs/
!packages/browser/**/logs/
*.log

# Cache
.eslintcache
.idea
.npm
Expand All @@ -14,7 +12,6 @@ logs/
!.vscode/extensions.json
!.vscode/*.todo

# Directories
build/
coverage/
cjs/
Expand All @@ -30,17 +27,14 @@ node_modules/
target/
.next
.netlify
.pnpm-store
.vercel

# Custom
*.min.js
*.map
*.tsbuildinfo
.env
docker-compose.yaml

# rust
core/integration-tests/.*
core/integration-tests/*libraries*
static
Expand Down
3 changes: 2 additions & 1 deletion .npmrc
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
strict-peer-dependencies=false
strict-peer-dependencies=false
node-linker=hoisted
8 changes: 3 additions & 5 deletions .prettierignore
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# Files
generated.ts
*-lock.*

# Directories
node_modules
target
dist
build
.next
.expo

# locale files
interface/src/i18n/locales/*.json
packages/browser/src/i18n/locales/*.json

CHANGELOG.md
CHANGELOG.md
5 changes: 4 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
"[rust]": {
"editor.defaultFormatter": "rust-lang.rust-analyzer"
},
"tailwindCSS.experimental.classRegex": [["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"]],
"tailwindCSS.experimental.classRegex": [
["cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]"],
["cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)"]
],
"tailwindCSS.classAttributes": ["class", "className", ".*CLASSES", ".*VARIANTS"],
"typescript.tsdk": "node_modules/typescript/lib"
}
Loading
Loading