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

Transfer repo to new organization #2

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
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
52 changes: 25 additions & 27 deletions .devcontainer/devcontainer-lock.json
Original file line number Diff line number Diff line change
@@ -1,35 +1,14 @@
{
"features": {
"ghcr.io/deep-space-cartel/devcontainers-features/apt:1": {
"version": "1.1.0",
"resolved": "ghcr.io/deep-space-cartel/devcontainers-features/apt@sha256:3a8ef060a682ecded4d2b68c951a4f58d22629df4f169534ae9b4e647a60e8d2",
"integrity": "sha256:3a8ef060a682ecded4d2b68c951a4f58d22629df4f169534ae9b4e647a60e8d2"
},
"ghcr.io/deep-space-cartel/devcontainers-features/pip:1": {
"version": "1.0.0",
"resolved": "ghcr.io/deep-space-cartel/devcontainers-features/pip@sha256:9e68548232099e2fa129723ae3c0962b59416c16028c8d7c1a10d963a3ff05ac",
"integrity": "sha256:9e68548232099e2fa129723ae3c0962b59416c16028c8d7c1a10d963a3ff05ac",
"dependsOn": [
"ghcr.io/deep-space-cartel/devcontainers-features/apt:1"
]
},
"ghcr.io/deep-space-cartel/devcontainers-features/starship:1": {
"version": "1.2.0",
"resolved": "ghcr.io/deep-space-cartel/devcontainers-features/starship@sha256:70ae84bb250918d1da871ca6e2bdc7017ff420cc7dd04bafc0ec6ecb8527e4ef",
"integrity": "sha256:70ae84bb250918d1da871ca6e2bdc7017ff420cc7dd04bafc0ec6ecb8527e4ef",
"dependsOn": [
"ghcr.io/devcontainers/features/common-utils"
]
},
"ghcr.io/devcontainers/features/common-utils": {
"version": "2.5.1",
"resolved": "ghcr.io/devcontainers/features/common-utils@sha256:9da676524999513412f2c27604d786ba0bbf3575eb1859166c5a1233f037fc08",
"integrity": "sha256:9da676524999513412f2c27604d786ba0bbf3575eb1859166c5a1233f037fc08"
"version": "2.5.2",
"resolved": "ghcr.io/devcontainers/features/common-utils@sha256:5b1c376d30719a4dead8fb2f272ee496cfb506f2f92b7acf9e1c24cb5399ba7d",
"integrity": "sha256:5b1c376d30719a4dead8fb2f272ee496cfb506f2f92b7acf9e1c24cb5399ba7d"
},
"ghcr.io/devcontainers/features/docker-in-docker:2": {
"version": "2.11.0",
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:503f23cd692325b3cbb8c20a0ecfabb3444b0c786b363e0c82572bd7d71dc099",
"integrity": "sha256:503f23cd692325b3cbb8c20a0ecfabb3444b0c786b363e0c82572bd7d71dc099"
"version": "2.12.0",
"resolved": "ghcr.io/devcontainers/features/docker-in-docker@sha256:5f3e2005aad161ce3ff7700b2603f11935348c039f9166960efd050d69cd3014",
"integrity": "sha256:5f3e2005aad161ce3ff7700b2603f11935348c039f9166960efd050d69cd3014"
},
"ghcr.io/devcontainers/features/git:1": {
"version": "1.3.2",
Expand All @@ -40,6 +19,25 @@
"version": "1.0.13",
"resolved": "ghcr.io/devcontainers/features/github-cli@sha256:13b301a039ce9e0bb07d45ea0c106c946cfff01c3b9844bbec6b0c7bacba8de3",
"integrity": "sha256:13b301a039ce9e0bb07d45ea0c106c946cfff01c3b9844bbec6b0c7bacba8de3"
},
"ghcr.io/devcontainers/features/python:1": {
"version": "1.7.0",
"resolved": "ghcr.io/devcontainers/features/python@sha256:8452f39db0852420728c9f7503dd94b3fc71aa558b5e7c8f6f9ce6687e494ae3",
"integrity": "sha256:8452f39db0852420728c9f7503dd94b3fc71aa558b5e7c8f6f9ce6687e494ae3"
},
"ghcr.io/partcad/devcontainers-features/apt:2": {
"version": "2.0.0",
"resolved": "ghcr.io/partcad/devcontainers-features/apt@sha256:285ee2907fe57bd2f69b021e3eb72d78ff8116b3a4f93bd8dea1249b88a18310",
"integrity": "sha256:285ee2907fe57bd2f69b021e3eb72d78ff8116b3a4f93bd8dea1249b88a18310"
},
"ghcr.io/partcad/devcontainers-features/starship:2": {
"version": "2.0.1",
"resolved": "ghcr.io/partcad/devcontainers-features/starship@sha256:8ae2df858097ac1c782a125d9dbd8a8027efd6181f7d97ef6a012ea90813d4c1",
"integrity": "sha256:8ae2df858097ac1c782a125d9dbd8a8027efd6181f7d97ef6a012ea90813d4c1",
"dependsOn": [
"ghcr.io/devcontainers/features/common-utils",
"ghcr.io/partcad/devcontainers-features/apt:2"
]
}
}
}
137 changes: 19 additions & 118 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,139 +2,40 @@
{
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye",
"remoteEnv": {
"WAKATIME_API_KEY": "${localEnv:WAKATIME_API_KEY}",
"PATH": "${containerEnv:PATH}:/opt/pip/bin",
"GITHUB_TOKEN": "${localEnv:GITHUB_TOKEN}"
"GITHUB_TOKEN": "${localEnv:GITHUB_TOKEN}",
"PRE_COMMIT_HOME": "${containerWorkspaceFolder}/.pre-commit",
"WAKATIME_API_KEY": "${localEnv:WAKATIME_API_KEY}"
},
"features": {
"ghcr.io/devcontainers/features/git:1": {},
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/deep-space-cartel/devcontainers-features/starship:1": {},
"ghcr.io/deep-space-cartel/devcontainers-features/apt:1": {
"ghcr.io/partcad/devcontainers-features/starship:2": {},
"ghcr.io/partcad/devcontainers-features/apt:2": {
"packages": "bash-completion shellcheck mc python3-pip python3-venv" // shfmt
},
"ghcr.io/deep-space-cartel/devcontainers-features/pip:1": {
"packages": "pre-commit",
"location": "/opt/pip"
"ghcr.io/devcontainers/features/python:1": {
"installTools": true,
"toolsToInstall": [
"pre-commit"
],
"version": "latest"
}
},
"customizations": {
"vscode": {
"settings": {
"tasks": {
"version": "2.0.0",
"tasks": [
{
"label": "pre-commit: manual",
"type": "shell",
"command": "pre-commit",
"args": [
"run",
"--hook-stage",
"manual"
],
"group": {
"kind": "test",
"isDefault": false
}
},
{
"label": "Dev Containers: Build ubik",
"type": "shell",
"command": ".github/actions/smoke-test/build.sh",
"args": [
"ubik"
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Starship: Install Completions",
"type": "shell",
"command": "sudo",
"args": [
"bash",
"-c",
"starship completions $(basename $SHELL) > /etc/bash_completion.d/99-starship-completions.sh"
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Dev Containers: Publish Templates",
"type": "shell",
"command": "devcontainer",
"args": [
"templates",
"publish",
"--namespace",
"deep-space-cartel/devcontainers-templates",
"src/"
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Dev Containers: Upgrade lockfile",
"type": "shell",
"command": "devcontainer",
"args": [
"upgrade",
"--workspace-folder",
"."
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Dev Container Feature: Generate Docs",
"type": "shell",
"command": "devcontainer",
"args": [
"templates",
"generate-docs",
"--github-owner",
"deep-space-cartel",
"--github-repo",
"devcontainers-templates",
"--project-folder",
"src/"
],
"group": {
"kind": "build",
"isDefault": false
}
}
]
},
"editor.fontFamily": "'Hack Nerd Font Mono'",
"terminal.integrated.fontFamily": "'Hack Nerd Font Mono'",
"files.insertFinalNewline": true,
"dotfiles.repository": "deep-space-cartel/dotfiles",
"cSpell.enableFiletypes": [
"*"
],
"remote.extensionKind": {
"ms-vscode.PowerShell": [
"ui"
],
"1Password.op-vscode": [
"ui"
]
}
"dotfiles.repository": "partcad/dotfiles"
},
"extensions": [
"DavidAnson.vscode-markdownlint",
"dbaeumer.vscode-eslint",
"GitHub.vscode-codeql",
"GitHub.vscode-github-actions",
"GitHub.vscode-pull-request-github",
"mads-hartmann.bash-ide-vscode",
"dbaeumer.vscode-eslint"
"streetsidesoftware.code-spell-checker",
"yzhang.markdown-all-in-one"
]
}
},
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
6 changes: 5 additions & 1 deletion .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,12 @@ 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
pull-requests: write
packages: write
steps:
- uses: actions/checkout@v3

Expand Down
2 changes: 1 addition & 1 deletion .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 Down
16 changes: 16 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"editor.fontFamily": "'Hack Nerd Font Mono'",
"terminal.integrated.fontFamily": "'Hack Nerd Font Mono'",
"files.insertFinalNewline": true,
"cSpell.enableFiletypes": [
"*"
],
"remote.extensionKind": {
"ms-vscode.PowerShell": [
"ui"
],
"1Password.op-vscode": [
"ui"
]
}
}
94 changes: 94 additions & 0 deletions .vscode/tasks.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
{
"version": "2.0.0",
"tasks": [
{
"label": "pre-commit: manual",
"type": "shell",
"command": "pre-commit",
"args": [
"run",
"--hook-stage",
"manual"
],
"group": {
"kind": "test",
"isDefault": false
}
},
{
"label": "Dev Containers: Build ubik",
"type": "shell",
"command": ".github/actions/smoke-test/build.sh",
"args": [
"ubik"
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Starship: Install Completions",
"type": "shell",
"command": "sudo",
"args": [
"bash",
"-c",
"starship completions $(basename $SHELL) > /etc/bash_completion.d/99-starship-completions.sh"
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Dev Containers: Publish Templates",
"type": "shell",
"command": "devcontainer",
"args": [
"templates",
"publish",
"--namespace",
"partcad/devcontainers-templates",
"src/"
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Dev Containers: Upgrade lockfile",
"type": "shell",
"command": "devcontainer",
"args": [
"upgrade",
"--workspace-folder",
"."
],
"group": {
"kind": "build",
"isDefault": false
}
},
{
"label": "Dev Container Feature: Generate Docs",
"type": "shell",
"command": "devcontainer",
"args": [
"templates",
"generate-docs",
"--github-owner",
"partcad",
"--github-repo",
"devcontainers-templates",
"--project-folder",
"src/"
],
"group": {
"kind": "build",
"isDefault": false
}
}
]
}
8 changes: 7 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Dev Containers Templates

[![CI - Test Templates](https://github.com/deep-space-cartel/devcontainers-templates/actions/workflows/test-pr.yaml/badge.svg)](https://github.com/deep-space-cartel/devcontainers-templates/actions/workflows/test-pr.yaml)
[![CI - Test Templates](https://github.com/partcad/devcontainers-templates/actions/workflows/test-pr.yaml/badge.svg)](https://github.com/partcad/devcontainers-templates/actions/workflows/test-pr.yaml)

### Adding Templates to the Index

Expand All @@ -11,3 +11,9 @@ Next you will need to add your Templates collection to our [public index](https:
* Open a PR to modify the [collection-index.yml](https://github.com/devcontainers/devcontainers.github.io/blob/gh-pages/_data/collection-index.yml) file

This index is from where [supporting tools](https://containers.dev/supporting) like [VS Code Dev Containers](https://marketplace.visualstudio.com/items?itemName=ms-vscode-remote.remote-containers) and [GitHub Codespaces](https://github.com/templates/codespaces) surface Templates for their Dev Container Creation Configuration UI.

### Locking Features

```bash
find src/ -mindepth 1 -maxdepth 1 -type d | xargs -n1 devcontainer upgrade --workspace-folder
```
Loading
Loading