Skip to content
Open
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
14 changes: 14 additions & 0 deletions .devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"version": "2.12.0",
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:5f3e2005aad161ce3ff7700b2603f11935348c039f9166960efd050d69cd3014",
"integrity": "sha256:5f3e2005aad161ce3ff7700b2603f11935348c039f9166960efd050d69cd3014"
},
"ghcr.io/devcontainers/features/python:1": {
"version": "1.7.0",
"resolved": "ghcr.io/devcontainers/features/python@sha256:8452f39db0852420728c9f7503dd94b3fc71aa558b5e7c8f6f9ce6687e494ae3",
"integrity": "sha256:8452f39db0852420728c9f7503dd94b3fc71aa558b5e7c8f6f9ce6687e494ae3"
}
}
}
186 changes: 20 additions & 166 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,176 +12,30 @@
"Codeium.codeium"
],
"settings": {
"remote.extensionKind": {
"GitHub.vscode-codeql": [
"ui"
]
},
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "Dev Container Feature: Publish Packages",
"type": "shell",
"command": "devcontainer",
"args": [
"features",
"publish",
"--namespace",
"deepspacecartel/devcontainers-features",
"src/"
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Dev Container Feature: Generate Docs",
"type": "shell",
"command": "devcontainer",
"args": [
"features",
"generate-docs",
"--namespace",
"deepspacecartel/devcontainers-features",
"--project-folder",
"src/"
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "pre-commit: manual",
"type": "shell",
"command": "pre-commit",
"args": [
"run",
"--hook-stage",
"manual"
],
"group": {
"kind": "test",
"isDefault": false
}
},
{
"label": "Dev Container Feature: Test Everything",
"type": "shell",
"command": "devcontainer",
"args": [
"features",
"test"
],
"group": {
"kind": "test",
"isDefault": true
}
},
{
"label": "Dev Container Feature: Test Global Scenarios",
"type": "shell",
"command": "devcontainer",
"args": [
"features",
"test",
"--global-scenarios-only",
"/workspaces/devcontainers-features"
],
"group": {
"kind": "test",
"isDefault": false
}
},
{
"label": "Dev Container Feature: Test starship",
"type": "shell",
"command": "devcontainer",
"args": [
"features",
"test",
"--features",
"starship",
"--remote-user",
"root",
"--base-image",
"mcr.microsoft.com/devcontainers/javascript-node:1-20-bookworm",
"/workspaces/devcontainers-features"
],
"group": {
"kind": "test",
"isDefault": false
}
},
{
"label": "Dev Container Feature: Test apt",
"type": "shell",
"command": "devcontainer",
"args": [
"features",
"test",
"--features",
"apt",
"--remote-user",
"root",
"--base-image",
"mcr.microsoft.com/devcontainers/javascript-node:1-20-bookworm",
"/workspaces/devcontainers-features"
],
"group": {
"kind": "test",
"isDefault": false
}
},
{
"label": "Dev Container Feature: Test pip",
"type": "shell",
"command": "devcontainer",
"args": [
"features",
"test",
"--features",
"pip",
"--remote-user",
"root",
"--base-image",
"mcr.microsoft.com/devcontainers/javascript-node:1-20-bookworm",
"/workspaces/devcontainers-features"
],
"group": {
"kind": "test",
"isDefault": false
}
}
]
},
"dotfiles.repository": "deepspacecartel/dotfiles",
"editor.fontFamily": "'Hack Nerd Font Mono'",
"files.insertFinalNewline": true,
"json.schemas": [
{
"fileMatch": [
"*/devcontainer-feature.json"
],
"url": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainerFeature.schema.json"
}
],
"terminal.integrated.fontFamily": "'Hack Nerd Font Mono'"
"dotfiles.repository": "partcad/dotfiles"
}
}
},
"containerEnv": {
"PRE_COMMIT_HOME": "${containerWorkspaceFolder}/.pre-commit"
},
"postCreateCommand": {
"pre-commit": "pre-commit install"
},
"features": {
// "ghcr.io/deepspacecartel/devcontainers-features/starship:1": {},
// "ghcr.io/deepspacecartel/devcontainers-features/pip:1": {
// "packages": "pre-commit",
// "location": "/opt/pip"
// },
// "ghcr.io/deepspacecartel/devcontainers-features/apt:1": {
// "packages": "shellcheck shfmt mc python3-pip python3-venv"
// },
// "ghcr.io/devcontainers/features/docker-in-docker:2": {}
"ghcr.io/devcontainers/features/python:1": {
"installTools": true,
"toolsToInstall": [
"pre-commit",
"poetry"
],
"version": "latest"
},
"ghcr.io/partcad/devcontainers-features/starship:2": {},
"ghcr.io/partcad/devcontainers-features/apt:2": {
"packages": "shellcheck shfmt mc python3-pip python3-venv"
},
"ghcr.io/devcontainers/features/docker-in-docker:2": {}
},
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-20-bookworm",
"remoteEnv": {
Expand Down
2 changes: 1 addition & 1 deletion .env
Original file line number Diff line number Diff line change
@@ -1 +1 @@
GITHUB_TOKEN = "op://DeepSpaceCartel/GITHUB_TOKEN/CLASSIC"
GITHUB_TOKEN = "op://PartCAD/GITHUB_TOKEN/CLASSIC"
2 changes: 1 addition & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:

jobs:
deploy:
if: ${{ github.ref == 'refs/heads/main' }}
if: ${{ github.ref == 'refs/heads/main' || github.ref == 'refs/heads/transfer' }}
runs-on: ubuntu-latest
permissions:
contents: write
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.pre-commit/
.venv/
output/
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# See https://pre-commit.com/hooks.html for more hooks
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.2.0
rev: v5.0.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer
Expand All @@ -14,7 +14,7 @@ repos:
hooks:
- id: devcontainer-docs
name: "Dev Container Features: Generate Docs"
entry: devcontainer features generate-docs --namespace deepspacecartel/devcontainers-features --project-folder src/
entry: devcontainer features generate-docs --namespace partcad/devcontainers-features --project-folder src/
language: system
always_run: true
pass_filenames: false
Expand Down
21 changes: 21 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"remote.extensionKind": {
"GitHub.vscode-codeql": [
"ui"
]
},
"editor.fontFamily": "'Hack Nerd Font Mono'",
"files.insertFinalNewline": true,
"json.schemas": [
{
"fileMatch": [
"*/devcontainer-feature.json"
],
"url": "https://raw.githubusercontent.com/devcontainers/spec/main/schemas/devContainerFeature.schema.json"
}
],
"terminal.integrated.fontFamily": "'Hack Nerd Font Mono'",
"cSpell.words": [
"ncontainers"
]
}
Loading