Skip to content

Commit

Permalink
Merge pull request #73 from localgovdrupal/4.x
Browse files Browse the repository at this point in the history
4.0.1 release
  • Loading branch information
finnlewis authored Nov 28, 2024
2 parents 0fc9a94 + 9697954 commit a35a348
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 12 deletions.
14 changes: 8 additions & 6 deletions .github/workflows/localgov_microsites.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ jobs:
build:
name: Install LocalGov Microsites
runs-on: ubuntu-latest
env:
COMPOSER_EXIT_ON_PATCH_FAILURE: '1'

strategy:
fail-fast: false
Expand Down Expand Up @@ -65,7 +67,7 @@ jobs:
echo "LATEST_RELEASE=${LATEST_RELEASE}" >> $GITHUB_ENV
- name: Cached workspace
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ./html
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
Expand All @@ -76,7 +78,7 @@ jobs:
php-version: ${{ matrix.php-version }}

- name: Clone drupal_container
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: localgovdrupal/drupal-container
ref: php${{ matrix.php-version }}
Expand All @@ -102,7 +104,7 @@ jobs:
steps:

- name: Cached workspace
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ./html
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
Expand Down Expand Up @@ -137,7 +139,7 @@ jobs:
steps:

- name: Cached workspace
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ./html
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
Expand Down Expand Up @@ -173,13 +175,13 @@ jobs:
steps:

- name: Clone Drupal container
uses: actions/checkout@v2
uses: actions/checkout@v4
with:
repository: localgovdrupal/drupal-container
ref: php${{ matrix.php-version }}

- name: Cached workspace
uses: actions/cache@v2
uses: actions/cache@v4
with:
path: ./html
key: localgov-build-${{ matrix.localgov-version }}-${{ matrix.drupal-version }}-${{ matrix.php-version }}-${{ github.run_id }}-${{ secrets.CACHE_VERSION }}
Expand Down
21 changes: 16 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ First you need to [install Composer](https://getcomposer.org/doc/00-intro.md#ins
After that you can create the project:

```shell
composer create-project --stability beta localgovdrupal/localgov_microsites_project:^4.0@beta MY_PROJECT --no-install
composer create-project --stability stable localgovdrupal/localgov_microsites_project:^4.0 MY_PROJECT --no-install
```

## Using Lando
Expand All @@ -20,17 +20,28 @@ If using Lando, you can then boot up Lando and run the site install
cd MY_PROJECT
lando start
lando composer install
lando drush si localgov_microsites
lando drush si localgov_microsites -y
```

## Not using Lando
## Using DDEV

If you're not using lando, you'll still need to run the composer install.
If using ddev, you can then boot up ddev and run the site install

```shell
cd MY_PROJECT
ddev start
ddev composer install
ddev drush si localgov_microsites -y
```

## Using host machine

If you're working directly on your host machine, you'll still need to run the composer install.

```shell
cd MY_PROJECT
composer install
drush si localgov_microsites
drush si localgov_microsites -y
```

## Running PHPUnit tests in Lando
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"drupal/core-composer-scaffold": "^10.0@stable",
"drupal/core-recommended": "^10.0@stable",
"drush/drush": "^12.0",
"localgovdrupal/localgov_microsites": "^4.0@beta"
"localgovdrupal/localgov_microsites": "^4.0"
},
"require-dev": {
"brianium/paratest": "^6.3",
Expand Down

0 comments on commit a35a348

Please sign in to comment.