Skip to content

Commit

Permalink
Merge dev to stable (#194)
Browse files Browse the repository at this point in the history
  • Loading branch information
inetol authored Feb 4, 2025
2 parents b48e779 + db6ad89 commit 9202283
Show file tree
Hide file tree
Showing 79 changed files with 1,143 additions and 1,132 deletions.
17 changes: 14 additions & 3 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
*
!dist/
!bunfig.toml
!LICENSE

# Project files
!/go.mod
!/go.sum
!/LICENSE
!/server.go
!/taskfile.yml

# WWW
!/www/**
/www/dist/
/www/node_modules/
# TODO: rollup-plugin-visualizer issue
/www/bundle.html
34 changes: 29 additions & 5 deletions .env.example
Original file line number Diff line number Diff line change
@@ -1,7 +1,31 @@
#? Rename or copy this file to ".env" and set the variables there.
#?
#?####################
#? VARIABLE STRUCTURE:
#?####################
#? [ default ] : type < min - max >
#? ^ ^ ^
#? | | |
#? | | +---- RANGE between two values (these included)
#? | +-------------- TYPE of the variable
#? +------------------------ DEFAULT value applied if not set
#?
#?###################
#? COMMENT STRUCTURE:
#?###################
#? "#?#..." or "###..." are used to comment a section line.
#? "#?" is used to comment a help line.
#? "##" is used to comment a description line.
#? "#" is used to comment a variable line.
#?
#? You should remove the comment on variable lines only if you want to set the variable.

##########
## SERVER:
# Set log verbosity [3]:integer
# (0=none <- 1=error <- 2=warn <- 3=info <- 4=debug)
#LOGLEVEL=3
##########
## Address to bind the server to. [localhost]:string
#? ("127.0.0.1", "[::1]", "0.0.0.0", "[::]", "localhost", ...)
#JSPF_BIND_ADDRESS=localhost

# Port for the server [3000]:integer
#PORT=3000
## Listen port for the server. [3000]:integer
#JSPF_PORT=3000
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
*.cmd text eol=crlf
*.coffee text
*.css text diff=css
*.go text diff=golang
*.htm text diff=html
*.html text diff=html
*.inc text
Expand Down
9 changes: 0 additions & 9 deletions .github/dependabot.yml

This file was deleted.

4 changes: 4 additions & 0 deletions .github/renovate.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": ["config:recommended"]
}
13 changes: 2 additions & 11 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,10 @@ jobs:

steps:
- name: Harden Runner
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
with:
egress-policy: audit

- name: Setup Bun
uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2.0.1

- name: Setup QEMU
run: |
sudo apt-get update
Expand Down Expand Up @@ -70,12 +67,6 @@ jobs:
with:
persist-credentials: false

- name: Setup dependencies
run: bun install --frozen-lockfile

- name: Run build:server
run: bun run build:server

- name: Build image
id: build-image
uses: redhat-actions/buildah-build@7a95fa7ee0f02d552a32753e7414641a04307056 # v2.13
Expand Down Expand Up @@ -106,7 +97,7 @@ jobs:

- if: ${{ inputs.image-action == 'build-release' }}
name: Attest image
uses: actions/attest-build-provenance@7668571508540a607bdfd90a87a560489fe372eb # v2.1.0
uses: actions/attest-build-provenance@520d128f165991a6c774bcb264f323e3d70747f4 # v2.2.0
with:
subject-name: "${{ env.REGISTRY }}/${{ steps.build-image.outputs.image }}"
subject-digest: ${{ steps.push-image.outputs.digest }}
Expand Down
40 changes: 33 additions & 7 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,20 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Harden Runner
uses: step-security/harden-runner@0080882f6c36860b6ba35c610c98ce87d4e2f26f # v2.10.2
uses: step-security/harden-runner@cb605e52c26070c328afc4562f0b4ada7618a84e # v2.10.4
with:
egress-policy: audit

- name: Setup Go
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
with:
go-version: '~1.23.0'

- name: Setup Task
uses: arduino/setup-task@b91d5d2c96a56797b48ac1e0e89220bf64044611 # v2.0.0
with:
version: 3.x

- name: Setup Bun
uses: oven-sh/setup-bun@4bc047ad259df6fc24a6c9b0f9a0cb08cf17fbe5 # v2.0.1

Expand All @@ -40,11 +50,27 @@ jobs:
with:
persist-credentials: false

- name: Setup dependencies
run: bun install --frozen-lockfile
- name: Install "www/" dependencies
run: task install-www-ci

- name: Run build:server
run: bun run build:server
- name: Build "www/"
run: task build-www

- name: Test run "www/"
run: |
task start-www &
SERVER_PID=$!
sleep 10
kill $SERVER_PID
- name: Run golangci-lint
uses: golangci/golangci-lint-action@e60da84bfae8c7920a47be973d75e15710aa8bd7 # v6.3.0
with:
version: latest

- name: Run lint
run: bun run lint
- name: Test run server
run: |
task start-server &
SERVER_PID=$!
sleep 10
kill $SERVER_PID
172 changes: 32 additions & 140 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,140 +1,32 @@
# Logs
logs
*.log
npm-debug.log*
yarn-debug.log*
yarn-error.log*
lerna-debug.log*
.pnpm-debug.log*

# VSCode IDE
.vscode/

# Jetbrains IDEs
.idea/

# Finder (MacOS) folder config
.DS_Store/

# Million lint
.million

# Diagnostic reports (https://nodejs.org/api/report.html)
report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json

# Runtime data
pids
*.pid
*.seed
*.pid.lock

# Directory for instrumented libs generated by jscoverage/JSCover
lib-cov

# Coverage directory used by tools like istanbul
coverage
*.lcov

# nyc test coverage
.nyc_output

# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
.grunt

# Bower dependency directory (https://bower.io/)
bower_components

# node-waf configuration
.lock-wscript

# Compiled binary addons (https://nodejs.org/api/addons.html)
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Snowpack dependency directory (https://snowpack.dev/)
web_modules/

# TypeScript cache
*.tsbuildinfo

# Optional npm cache directory
.npm

# Optional eslint cache
.eslintcache

# Optional stylelint cache
.stylelintcache

# Microbundle cache
.rpt2_cache/
.rts2_cache_cjs/
.rts2_cache_es/
.rts2_cache_umd/

# Optional REPL history
.node_repl_history

# Output of 'npm pack'
*.tgz

# Yarn Integrity file
.yarn-integrity

# dotenv environment variable files
.env
.env.*
!.env.example

# parcel-bundler cache (https://parceljs.org/)
.cache
.parcel-cache

# Next.js build output
.next
out
next-env.d.ts

# Nuxt.js build / generate output
.nuxt
dist

# Gatsby files
.cache/
# Comment in the public line in if your project uses Gatsby and not Next.js
# https://nextjs.org/blog/next-9-1#public-directory-support
# public

# vuepress build output
.vuepress/dist

# vuepress v2.x temp and cache directory
.temp

# Docusaurus cache and generated files
.docusaurus

# Serverless directories
.serverless/

# FuseBox cache
.fusebox/

# DynamoDB Local files
.dynamodb/

# TernJS port file
.tern-port

# Stores VSCode versions used for testing VSCode extensions
.vscode-test

# yarn v2
.yarn/cache
.yarn/unplugged
.yarn/build-state.yml
.yarn/install-state.gz
.pnp.*
*

# Project files
!/.env.example
!/go.mod
!/go.sum
!/LICENSE
!/README.md
!/server.go
!/taskfile.yml

# WWW
!/www/
!/www/**
/www/dist/
/www/node_modules/
# TODO: rollup-plugin-visualizer issue
/www/bundle.html

# GIT
!/.gitattributes
!/.gitignore

# GitHub
!/.github/
!/.github/**
!/.github/renovate.json
!/.github/workflows/*.yml

# Docker
!/.dockerignore
!/Dockerfile
Loading

0 comments on commit 9202283

Please # to comment.