Skip to content

Commit

Permalink
feat: update devcontainer (#82)
Browse files Browse the repository at this point in the history
* feat: udapte devcontainer

* chore: remove files

* ci: set node version
  • Loading branch information
okhiroyuki authored Mar 3, 2024
1 parent 262e989 commit e42a55f
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 24 deletions.
35 changes: 25 additions & 10 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,32 +1,47 @@
// For format details, see https://aka.ms/devcontainer.json. For config options, see the
// README at: https://github.com/devcontainers/templates/tree/main/src/typescript-node
{
"name": "Node.js",
"name": "Node.js & Android",
// Or use a Dockerfile or Docker Compose file. More info: https://containers.dev/guide/dockerfile
"dockerComposeFile": "../docker-compose.yml",
"service": "devcontainer",
"workspaceFolder": "/workspace",
"image": "mcr.microsoft.com/devcontainers/javascript-node:1-18-bullseye",

// Features to add to the dev container. More info: https://containers.dev/features.
// "features": {},
"features": {
"ghcr.io/devcontainers/features/java:1": {
"version": "17",
"installGradle": true
},
"ghcr.io/akhildevelops/devcontainer-features/android-cli:0": {
"PACKAGES": "platform-tools,platforms;android-33,build-tools;33.0.2,ndk-bundle,ndk;24.0.8215888,cmake;3.22.1"
}
},

// Use 'forwardPorts' to make a list of ports inside the container available locally.
// "forwardPorts": [],

// Use 'postCreateCommand' to run commands after the container is created.
// "postCreateCommand": "npm ci",
// "postCreateCommand": "yarn install",
"postAttachCommand": "npm ci",

// Configure tool-specific properties.
"customizations": {
"vscode": {
"extensions": [
"usernamehw.errorlens",
"eamodio.gitlens",
"streetsidesoftware.code-spell-checker",
"esbenp.prettier-vscode",
"EditorConfig.EditorConfig",
"emeraldwalk.RunOnSave",
"GitHub.vscode-pull-request-github",
"redhat.vscode-yaml"
]
"redhat.vscode-yaml",
"github.vscode-github-actions",
"DavidAnson.vscode-markdownlint"
],
"settings": {
"terminal.integrated.defaultProfile.linux": "zsh"
}
}
}

// Uncomment to connect as root instead. More info: https://aka.ms/dev-containers-non-root.
// "remoteUser": "root"
}
5 changes: 1 addition & 4 deletions .github/workflows/build-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,12 @@ jobs:
- name: Use Node.js
uses: actions/setup-node@v4
with:
node-version-file: ".node-version"
node-version: "18"
- name: set up JDK 11
uses: actions/setup-java@v4
with:
distribution: "temurin"
java-version: "11"
- name: Installing Cordova!
run: |
sudo npm i cordova -g
- name: npm install, build, and test
run: |
npm ci
Expand Down
1 change: 0 additions & 1 deletion .node-version

This file was deleted.

8 changes: 0 additions & 8 deletions docker-compose.yml

This file was deleted.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"build:node": "node zipLibNode.js",
"test:clean": "rimraf testapp/node_modules testapp/plugins testapp/platforms testapp/temp-module-copy",
"test:install": "cd testapp && npm i",
"test:android": "cd testapp && cordova platform add android && cordova prepare android && cordova build",
"test:android": "cd testapp && npx cordova platform add android && npx cordova prepare android && npx cordova build",
"test:build": "run-s test:clean test:install test:android"
},
"keywords": [
Expand Down

0 comments on commit e42a55f

Please sign in to comment.