Skip to content

Commit

Permalink
Merge pull request #6 from aem-design/develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
wildone committed May 2, 2023
2 parents 1f99cd3 + 75446ab commit 9eb226f
Show file tree
Hide file tree
Showing 44 changed files with 134,944 additions and 1,582 deletions.
11 changes: 11 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"image": "aemdesign/java-buildpack:jdk11",
"workspaceMount": "source=${localWorkspaceFolder},target=/build/source,type=bind",
"workspaceFolder": "/build/source",
"extensions": [
"mutantdino.resourcemonitor"
],
"mounts": [
"source=${localEnv:HOME}${localEnv:USERPROFILE}/.m2/,target=/build/.m2/,type=bind,consistency=cached"
]
}
9 changes: 7 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,20 @@ on: [push]

jobs:
build:

if: "!contains(github.event.head_commit.message, 'skip ci')"
runs-on: ubuntu-latest
strategy:
max-parallel: 4
matrix:
python-version: [3.6]

steps:
- uses: actions/checkout@v1
- uses: actions/checkout@v2
with:
submodules: true
lfs: true
ref: ${{ github.head_ref }}
fetch-depth: 0
- name: set up python ${{ matrix.python-version }}
uses: actions/setup-python@v1
with:
Expand Down
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,6 @@ devops___*
.bash_history

#ignore selenium jars
selenium-server-*
selenium-server-*

.vscode
12 changes: 6 additions & 6 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[submodule "aemdesign-aem-core"]
path = aemdesign-aem-core
url = [email protected]:aem-design/aemdesign-aem-core.git
url = https://github.com/aem-design/aemdesign-aem-core.git
branch = master
[submodule "aemdesign-aem-support"]
path = aemdesign-aem-support
url = [email protected]:aem-design/aemdesign-aem-support.git
[submodule "aemdesign-archetype"]
path = aemdesign-archetype
url = [email protected]:aem-design/aemdesign-archetype.git
url = https://github.com/aem-design/aemdesign-aem-support.git
branch = master
[submodule "aemdesign-operations"]
path = aemdesign-operations
url = [email protected]:aem-design/aemdesign-operations.git
url = https://github.com/aem-design/aemdesign-operations.git
branch = master
27 changes: 0 additions & 27 deletions .travis.yml

This file was deleted.

3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"cmake.configureOnOpen": false
}
Loading

0 comments on commit 9eb226f

Please sign in to comment.