Skip to content

Commit

Permalink
Refactor, update, and isolate. (#27)
Browse files Browse the repository at this point in the history
* Refactor plugin structure, update to node 18, update dependencies, isolate testing.

* Feed the linter.
  • Loading branch information
reynoldsalec authored Dec 7, 2023
1 parent 67b2fdd commit edadbec
Show file tree
Hide file tree
Showing 13 changed files with 933 additions and 955 deletions.
9 changes: 3 additions & 6 deletions .github/workflows/pr-apache-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'
steps:
- name: Checkout code
uses: actions/checkout@v3
Expand All @@ -36,12 +36,9 @@ jobs:
with:
lando-version: ${{ matrix.lando-version }}
config: |
plugins.@lando/apache=/home/runner/work/apache/apache
setup.skipCommonPlugins=true
setup.plugins.@lando/apache=/home/runner/work/apache/apache
telemetry: false
- name: Verify Lando works and we are dogfooding this plugin for tests
run: |
lando version
lando config --path plugins | grep apache | grep /home/runner/work/apache/apache || (echo "::error:: Not dogfooding this plugin correctly!" && exit 1)
- name: Run Leia Tests
uses: lando/run-leia-action@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-docs-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-unit-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- ubuntu-22.04
- macos-12
node-version:
- '16'
- '18'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
os:
- ubuntu-22.04
node-version:
- '16'
- '18'
steps:
# Install deps and cache
- name: Checkout code
Expand Down
2 changes: 1 addition & 1 deletion .node-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
16
18
4 changes: 3 additions & 1 deletion services/apache/builder.js → builders/apache.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

// Modules
const _ = require('lodash');
const path = require('path');

// Builder
module.exports = {
Expand All @@ -13,7 +14,7 @@ module.exports = {
'2.4': 'bitnami/apache:2.4.41-debian-10-r52',
},
patchesSupported: true,
confSrc: __dirname,
confSrc: path.resolve(__dirname, '..', 'config'),
defaultFiles: {
server: 'httpd.conf',
vhosts: 'default.conf',
Expand All @@ -27,6 +28,7 @@ module.exports = {
},
parent: '_webserver',
builder: (parent, config) => class LandoApache extends parent {
// Constructor
constructor(id, options = {}) {
options = _.merge({}, config, options);
// Use different default for ssl
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"apache"
],
"engines": {
"node": ">=16.0.0"
"node": ">=18.0.0"
},
"bundledDependencies": [
"lodash"
Expand Down
1,863 changes: 921 additions & 942 deletions yarn.lock

Large diffs are not rendered by default.

0 comments on commit edadbec

Please sign in to comment.