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

Fetched template changes #44

Merged
merged 1 commit into from
Nov 17, 2023
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions .copier-answers.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
---
# Changes here will be overwritten by Copier; NEVER EDIT MANUALLY
_commit: 0.4.1
_commit: 0.5.0
_src_path: gh:radio-aktywne/template-app-generic
accountname: radio-aktywne
appname: fusion
Expand Down
34 changes: 17 additions & 17 deletions .dockerignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#Task
/.task
/.task/
/Taskfile.yaml
/Taskfile.yml

Expand All @@ -8,19 +8,19 @@
.todo

# Tracked, but not needed
.devcontainer
.github
.trunk
.vscode
docs
.copier-answers.yaml
.dockerignore
.envrc
.gitattributes
.gitignore
CONTRIBUTING.md
docker-compose.yaml
Dockerfile
LICENSE
README.md
Taskfile.dist.yaml
/.devcontainer/
/.github/
/.trunk/
/.vscode/
/docs/
/.copier-answers.yaml
/.dockerignore
/.envrc
/.gitattributes
/.gitignore
/CONTRIBUTING.md
/docker-compose.yaml
/Dockerfile
/LICENSE
/README.md
/Taskfile.dist.yaml
4 changes: 2 additions & 2 deletions .envrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/usr/bin/env bash

# reload when these files change
watch_file ./flake.lock ./*.nix
watch_file flake.lock ./*.nix

# activate the default development shell in the current shell
# --accept-flake-config will accept the nix configuration from the flake without prompting
eval "$(nix print-dev-env path:. --accept-flake-config)" || true
eval "$(nix print-dev-env path:./ --accept-flake-config)" || true
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mark everything as vendored
* linguist-vendored
# Treat docs as documentation
docs/** -linguist-vendored linguist-documentation
/docs/** -linguist-vendored linguist-documentation
# Unmark files in src, so that they are included in language stats
src/** -linguist-vendored
/src/** -linguist-vendored
1 change: 0 additions & 1 deletion .github/release.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
changelog:
exclude:
# Exclude PRs with the following labels from the changelog
Expand Down
27 changes: 13 additions & 14 deletions .github/workflows/docs.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Docs

# Only one workflow can run at a time
Expand All @@ -17,11 +16,11 @@ concurrency:
- main
# Run only on changes to relevant files
paths:
- ".github/workflows/docs.yaml"
- "docs/**"
- "flake.lock"
- .github/workflows/docs.yaml
- docs/**
- flake.lock
- "*.nix"
- "Taskfile.dist.yaml"
- Taskfile.dist.yaml

jobs:
build:
Expand All @@ -31,15 +30,15 @@ jobs:
# Use reasonable timeout to avoid stuck workflows
timeout-minutes: 10
env:
NIX_CACHE_DIR: /home/runner/.nixcache
NIX_CACHE_DIR: /home/runner/.nixcache/
permissions:
# Needed to checkout code
contents: read
# Needed to upload page artifact
pages: write
steps:
- name: Checkout code
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Setup Nix cache
uses: actions/[email protected]
id: cache-nix
Expand All @@ -49,13 +48,13 @@ jobs:
- name: Setup docs modules cache
uses: actions/[email protected]
with:
path: docs/node_modules
path: docs/node_modules/
key: docs-modules
- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v23
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.18.0/install
install_url: https://releases.nixos.org/nix/nix-2.18.1/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand All @@ -67,21 +66,21 @@ jobs:
run: >
nix
develop
.#docs
./#docs
--command
--
task
docs
--
build
--out-dir
build
build/
- name: Setup Pages
uses: actions/[email protected]
- name: Upload artifact
uses: actions/[email protected]
with:
path: docs/build
path: docs/build/
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Export Nix store cache
if: "!cancelled()"
Expand All @@ -91,7 +90,7 @@ jobs:
${{ env.NIX_CACHE_DIR }}
&&
nix-store
--export $(find /nix/store -maxdepth 1 -name '*-*')
--export $(find /nix/store/ -maxdepth 1 -name '*-*')
> ${{ env.NIX_CACHE_DIR }}/archive.nar
deploy:
name: Deploy docs
Expand Down
29 changes: 14 additions & 15 deletions .github/workflows/image.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Image

# Put 'on' in quotes to avoid YAML parsing error
Expand All @@ -11,25 +10,25 @@ name: Image
- main
# Run only on changes to relevant files
paths:
- ".github/workflows/image.yaml"
- "scripts/**"
- "src/**"
- ".dockerignore"
- "Dockerfile"
- "flake.lock"
- .github/workflows/image.yaml
- scripts/**
- src/**
- .dockerignore
- Dockerfile
- flake.lock
- "*.nix"
# Run also on pull requests to main branch
pull_request:
branches:
- main
# Run only on changes to relevant files
paths:
- ".github/workflows/image.yaml"
- "scripts/**"
- "src/**"
- ".dockerignore"
- "Dockerfile"
- "flake.lock"
- .github/workflows/image.yaml
- scripts/**
- src/**
- .dockerignore
- Dockerfile
- flake.lock
- "*.nix"

jobs:
Expand All @@ -44,13 +43,13 @@ jobs:
contents: read
steps:
- name: Checkout code
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Build Docker image
uses: docker/[email protected]
with:
context: .
context: ./
# Don't save image
outputs: type=cacheonly
# Cache Docker layers between builds
Expand Down
19 changes: 9 additions & 10 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Lint

# Put 'on' in quotes to avoid YAML parsing error
Expand All @@ -22,14 +21,14 @@ jobs:
# Use reasonable timeout to avoid stuck workflows
timeout-minutes: 10
env:
NIX_CACHE_DIR: /home/runner/.nixcache
TRUNK_CACHE_DIR: /home/runner/.trunkcache
NIX_CACHE_DIR: /home/runner/.nixcache/
TRUNK_CACHE_DIR: /home/runner/.trunkcache/
permissions:
# Needed to checkout code
contents: read
steps:
- name: Checkout code
uses: actions/[email protected].0
uses: actions/[email protected].1
# We need to fetch upstream so Trunk can compare against it
- name: Fetch upstream
if: github.event_name == 'pull_request'
Expand All @@ -52,13 +51,13 @@ jobs:
- name: Setup docs modules cache
uses: actions/[email protected]
with:
path: docs/node_modules
path: docs/node_modules/
key: lint-docs-modules
- name: Install Nix
uses: cachix/install-nix-action@v22
uses: cachix/install-nix-action@v23
with:
github_access_token: ${{ github.token }}
install_url: https://releases.nixos.org/nix/nix-2.18.0/install
install_url: https://releases.nixos.org/nix/nix-2.18.1/install
# See: https://github.com/cachix/install-nix-action/issues/56
- name: Import Nix store cache
if: steps.cache-nix.outputs.cache-hit == 'true'
Expand All @@ -74,7 +73,7 @@ jobs:
run: >
nix
develop
.#lint
./#lint
--command
--
task
Expand All @@ -91,7 +90,7 @@ jobs:
run: >
nix
develop
.#lint
./#lint
--command
--
task
Expand All @@ -107,5 +106,5 @@ jobs:
${{ env.NIX_CACHE_DIR }}
&&
nix-store
--export $(find /nix/store -maxdepth 1 -name '*-*')
--export $(find /nix/store/ -maxdepth 1 -name '*-*')
> ${{ env.NIX_CACHE_DIR }}/archive.nar
5 changes: 2 additions & 3 deletions .github/workflows/registry.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
name: Registry

# Put 'on' in quotes to avoid YAML parsing error
Expand All @@ -22,7 +21,7 @@ jobs:
packages: write
steps:
- name: Checkout code
uses: actions/[email protected].0
uses: actions/[email protected].1
- name: Set up Docker Buildx
uses: docker/[email protected]
- name: Log in to the Container registry
Expand All @@ -34,7 +33,7 @@ jobs:
- name: Build and push Docker image
uses: docker/[email protected]
with:
context: .
context: ./
push: true
# Slashes are here to make the string multiline and avoid using spaces
tags: "\
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 @@
/local.nix

#Task
/.task
/.task/
/Taskfile.yaml
/Taskfile.yml

Expand Down
15 changes: 7 additions & 8 deletions .trunk/.gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
*actions
*logs
*notifications
*out
*plugins
*tools
user_trunk.yaml
user.yaml
/*actions
/*logs
/*notifications
/*out
/*plugins
/*tools
/user.yaml
4 changes: 0 additions & 4 deletions .trunk/configs/.eslintrc.cjs

This file was deleted.

1 change: 0 additions & 1 deletion .trunk/configs/.markdownlint.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
---
# Enable all rules by default
default: true

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module.exports = {
export default {
js2svg: {
// Don't minify
pretty: true,
Expand Down
Loading