Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/python/django/django-4.2.7
Browse files Browse the repository at this point in the history
  • Loading branch information
tsubakimoto committed Apr 28, 2024
2 parents 2522315 + fb36ba0 commit 8e7ed8c
Show file tree
Hide file tree
Showing 13 changed files with 256 additions and 1 deletion.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/docker-in-docker
{
"name": "Docker in Docker",
"name": "Act only (Docker in Docker)",
"image": "mcr.microsoft.com/devcontainers/base:bullseye",
"features": {
"ghcr.io/devcontainers/features/common-utils:1": {
Expand Down
1 change: 1 addition & 0 deletions .devcontainer/dotnet6/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
refs https://github.com/github/dotnet-codespaces
58 changes: 58 additions & 0 deletions .devcontainer/dotnet6/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
{
"name": ".NET 6 in Codespaces",
"image": "mcr.microsoft.com/dotnet/sdk:6.0",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/github-cli:1": {
"version": "2"
},
"ghcr.io/devcontainers/features/powershell:1": {
"version": "latest"
},
"ghcr.io/azure/azure-dev/azd:0": {
"version": "latest"
},
"ghcr.io/devcontainers/features/common-utils:2": {}
// ,
// "ghcr.io/devcontainers/features/dotnet:2": {
// "version": "none",
// "dotnetRuntimeVersions": "7.0",
// "aspNetCoreRuntimeVersions": "7.0"
// }
},
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.vscode-node-azure-pack",
"GitHub.copilot",
"GitHub.vscode-github-actions",
// "ms-dotnettools.vscode-dotnet-runtime",
// "ms-dotnettools.csdevkit",
"ms-dotnettools.csharp"
]
}
},
// "forwardPorts": [
// 8080,
// 8081
// ],
// "postCreateCommand": "cd ./SampleApp && dotnet restore",
// "hostRequirements": {
// "memory": "8gb",
// "cpus": 4
// },
"remoteEnv": {
"DOTNET_MULTILEVEL_LOOKUP": "0",
"TARGET": "net6.0"
}
// "portsAttributes": {
// "8080": {
// "label": "Weather API",
// "onAutoForward": "notify"
// },
// "8081": {
// "label": "Weather Front End",
// "onAutoForward": "notify"
// }
// }
}
1 change: 1 addition & 0 deletions .devcontainer/dotnet8/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
refs https://github.com/github/dotnet-codespaces
57 changes: 57 additions & 0 deletions .devcontainer/dotnet8/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{
"name": ".NET 8 in Codespaces",
"image": "mcr.microsoft.com/dotnet/sdk:8.0",
"features": {
"ghcr.io/devcontainers/features/docker-in-docker:2": {},
"ghcr.io/devcontainers/features/github-cli:1": {
"version": "2"
},
"ghcr.io/devcontainers/features/powershell:1": {
"version": "latest"
},
"ghcr.io/azure/azure-dev/azd:0": {
"version": "latest"
},
"ghcr.io/devcontainers/features/common-utils:2": {},
"ghcr.io/devcontainers/features/dotnet:2": {
"version": "none",
"dotnetRuntimeVersions": "7.0",
"aspNetCoreRuntimeVersions": "7.0"
}
},
"customizations": {
"vscode": {
"extensions": [
"ms-vscode.vscode-node-azure-pack",
"GitHub.copilot",
"GitHub.vscode-github-actions",
"ms-dotnettools.vscode-dotnet-runtime",
"ms-dotnettools.csdevkit",
"ms-dotnettools.csharp"
]
}
},
// "forwardPorts": [
// 8080,
// 8081
// ],
// "postCreateCommand": "cd ./SampleApp && dotnet restore",
// "hostRequirements": {
// "memory": "8gb",
// "cpus": 4
// },
"remoteEnv": {
"DOTNET_MULTILEVEL_LOOKUP": "0",
"TARGET": "net8.0"
}
// "portsAttributes": {
// "8080": {
// "label": "Weather API",
// "onAutoForward": "notify"
// },
// "8081": {
// "label": "Weather Front End",
// "onAutoForward": "notify"
// }
// }
}
1 change: 1 addition & 0 deletions .devcontainer/express/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
refs https://github.com/github/codespaces-express
27 changes: 27 additions & 0 deletions .devcontainer/express/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
{
"name": "Express in Codespaces",
"image": "mcr.microsoft.com/devcontainers/universal:2",
// "hostRequirements": {
// "cpus": 4
// },
"waitFor": "onCreateCommand",
"updateContentCommand": "npm install",
"postCreateCommand": "",
"postAttachCommand": {
"server": "npm start"
},
// "customizations": {
// "codespaces": {
// "openFiles": [
// "index.js"
// ]
// }
// },
"portsAttributes": {
"3000": {
"label": "Application",
"onAutoForward": "openPreview"
}
},
"forwardPorts": [3000]
}
1 change: 1 addition & 0 deletions .devcontainer/php/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
refs https://github.com/microsoft/vscode-remote-try-php
35 changes: 35 additions & 0 deletions .devcontainer/php/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"name": "PHP in Codespaces",
"image": "mcr.microsoft.com/devcontainers/php:1-8.2",
// "hostRequirements": {
// "cpus": 4
// },
"waitFor": "onCreateCommand",
// "updateContentCommand": "pip install -r requirements.txt && python manage.py migrate",
// "postCreateCommand": "cp .env.example .env",
// "postAttachCommand": {
// "server": "python manage.py runserver"
// },
"customizations": {
// "codespaces": {
// "openFiles": [
// "hello_world/templates/index.html"
// ]
// },
"vscode": {
"extensions": [
"xdebug.php-pack",
"bmewburn.vscode-intelephense-client"
]
}
},
"portsAttributes": {
"8000": {
"label": "Application",
"onAutoForward": "openPreview"
}
},
"forwardPorts": [
8000
]
}
1 change: 1 addition & 0 deletions .devcontainer/python/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
refs https://github.com/github/codespaces-django
34 changes: 34 additions & 0 deletions .devcontainer/python/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
"name": "Python in Codespaces",
"image": "mcr.microsoft.com/devcontainers/universal:2",
// "hostRequirements": {
// "cpus": 4
// },
"waitFor": "onCreateCommand",
// "updateContentCommand": "pip install -r requirements.txt && python manage.py migrate",
// "postCreateCommand": "cp .env.example .env",
// "postAttachCommand": {
// "server": "python manage.py runserver"
// },
"customizations": {
// "codespaces": {
// "openFiles": [
// "hello_world/templates/index.html"
// ]
// },
"vscode": {
"extensions": [
"ms-python.python"
]
}
},
"portsAttributes": {
"8000": {
"label": "Application",
"onAutoForward": "openPreview"
}
},
"forwardPorts": [
8000
]
}
38 changes: 38 additions & 0 deletions .github/workflows/net80-eshop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# https://github.com/dotnet/eshop
name: Build eshop

on:
workflow_dispatch:
inputs:
checkout-version:
description: actions/checkout version
required: true
type: choice
options:
- v3
- v4

env:
REPOSITORY: dotnet/eshop

jobs:
build-eshop:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
with:
repository: ${{ env.REPOSITORY }}
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: '8.0.x'
- name: Setup workload
run: |
dotnet workload update
dotnet workload install aspire
- name: Restore
run: |
dotnet restore eShop.Web.slnf
- name: Build
run: |
dotnet build eShop.Web.slnf
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
act/payload.json
act/.secrets
.mono/

0 comments on commit 8e7ed8c

Please sign in to comment.