Skip to content

Commit

Permalink
Merge dev into stage
Browse files Browse the repository at this point in the history
  • Loading branch information
github-actions[bot] authored Jan 13, 2025
2 parents aba6471 + 3ae1aee commit 335631f
Show file tree
Hide file tree
Showing 99 changed files with 6,139 additions and 6,640 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/fe_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
cd /tmp/deploy
# Deploy
pnpm netlify env:set AWS_LAMBDA_JS_RUNTIME nodejs18.x
pnpm netlify env:set AWS_LAMBDA_JS_RUNTIME nodejs20.x
pnpm netlify env:set DRUPAL_EXTERNAL_URL $DRUPAL_EXTERNAL_URL
pnpm netlify deploy --prodIfUnlocked
Expand Down
34 changes: 26 additions & 8 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,22 @@ jobs:
DASHBOARD_ACCESS_TOKEN: ${{ secrets.DASHBOARD_ACCESS_TOKEN }}
run: amazeelabs-estimator update

init_script:
name: Init script
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Setup
uses: ./.github/actions/setup
- name: Test init script
run:
pnpm --filter @custom/init run init --project-human-name "Foo Bar"
--project-machine-name foo_bar | grep 'Run `pnpm i` to update the lock
file'

docker_build:
name: Docker Build
if:
Expand All @@ -143,22 +159,24 @@ jobs:
uses: actions/checkout@v4
with:
fetch-depth: 1
- name: Setup Ruby
uses: ruby/setup-ruby@v1
with:
ruby-version: 2
bundler-cache: true
- name: Install Pygmy
run: gem install pygmy
run: |
set -ex
git clone https://github.com/pygmystack/pygmy.git
cd pygmy
make build
ls -lisa ./builds
cp ./builds/pygmy-linux-amd64 /usr/local/bin/pygmy
chmod +x /usr/local/bin/pygmy
- name: Start Pygmy
run: pygmy up
- name: Docker Build & Up
run: DOCKER_BUILDKIT=1 docker-compose up -d --build
run: DOCKER_BUILDKIT=1 docker compose up -d --build
- name: Wait a bit
run: sleep 5
- name: Check containers status
run: |
if docker-compose ps | grep Exit
if docker compose ps | grep Exit
then
echo "Docker container(s) exited"
exit 1
Expand Down
10 changes: 5 additions & 5 deletions .gitpod.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
FROM gitpod/workspace-full

RUN bash -c 'VERSION="18.19.0" \
&& source $HOME/.nvm/nvm.sh && nvm install $VERSION \
&& nvm use $VERSION && nvm alias default $VERSION'
RUN bash -c 'VERSION="20.18.1" \
&& source $HOME/.nvm/nvm.sh && nvm install $VERSION \
&& nvm use $VERSION && nvm alias default $VERSION'

RUN echo "nvm use default &>/dev/null" >> ~/.bashrc.d/51-nvm-fix

Expand All @@ -19,8 +19,8 @@ RUN /home/gitpod/.deno/bin/deno completions bash > /home/gitpod/.bashrc.d/90-den
echo 'export PATH="$DENO_INSTALL/bin:$PATH"' >> /home/gitpod/.bashrc.d/90-deno

RUN sudo add-apt-repository ppa:maveonair/helix-editor && \
sudo apt update && \
sudo apt install helix
sudo apt update && \
sudo apt install helix

# Install phpactor
RUN curl -Lo phpactor.phar https://github.com/phpactor/phpactor/releases/latest/download/phpactor.phar
Expand Down
6 changes: 3 additions & 3 deletions .lagoon/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# ====================================================================================================
# BUILDER IMAGE
# ====================================================================================================
FROM uselagoon/node-18-builder as node
FROM uselagoon/node-20-builder as node
FROM uselagoon/php-8.3-cli-drupal as builder

COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
Expand Down Expand Up @@ -101,7 +101,7 @@ ENV WEBROOT=web
# PREVIEW IMAGE
# ====================================================================================================

FROM uselagoon/node-18 as preview
FROM uselagoon/node-20 as preview

RUN npm install -g [email protected]
COPY --from=builder /tmp/.deploy/preview /app
Expand All @@ -111,7 +111,7 @@ CMD pnpm start
# PUBLISHER IMAGE
# ====================================================================================================

FROM uselagoon/node-18 as publisher
FROM uselagoon/node-20 as publisher

RUN apk add --no-cache sqlite curl github-cli

Expand Down
204 changes: 0 additions & 204 deletions INIT.md

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Minimum steps
- Disable `Allow merge commits`
- Enable `Automatically delete head branches`
- Clone the newly create repo
- Run `pnpx @amazeelabs/mzx run INIT.md` from the project root
- Run `pnpm i && pnpm --filter @custom/init run init` from the project root
- Answer its questions
- Review the changes in the repo
- Commit and push
Expand Down
Loading

0 comments on commit 335631f

Please sign in to comment.