From 6409b7088005ba75ea60ed0063b276524415303c Mon Sep 17 00:00:00 2001 From: Robert Field Date: Thu, 16 Nov 2023 17:43:21 +0100 Subject: [PATCH] chore: update basic references to simple --- .github/workflows/generate-examples.yml | 198 +----------------------- package.json | 4 +- 2 files changed, 5 insertions(+), 197 deletions(-) diff --git a/.github/workflows/generate-examples.yml b/.github/workflows/generate-examples.yml index 4ec603d4..3515e80e 100644 --- a/.github/workflows/generate-examples.yml +++ b/.github/workflows/generate-examples.yml @@ -141,7 +141,7 @@ jobs: run: | echo "${{ secrets.TEST_ENV_FILE }}" > .env.test echo NEXT_PUBLIC_CI=true >> .env.test - echo NEXT_PUBLIC_CI=true >> ./examples/basic/.env.test + echo NEXT_PUBLIC_CI=true >> ./examples/simple/.env.test - name: Build everything run: pnpm build:e2e @@ -166,7 +166,7 @@ jobs: uses: actions/upload-artifact@v3 with: name: test-results - path: examples/basic/test-results + path: examples/simple/test-results continue-on-error: true - name: Report "Run examples e2e tests" conclusion @@ -176,196 +176,4 @@ jobs: token: ${{ secrets.GITHUB_TOKEN }} id: examples-e2e-tests conclusion: ${{ steps.examples-e2e-tests.outcome }} - fail-on-error: true - -# commit-latest-examples: -# name: Commit latest examples -# needs: generate-examples -# runs-on: ubuntu-latest -# outputs: -# commit_sha: ${{ steps.commit_changes.outputs.commit_long_sha }} -# steps: -# - name: Checkout Repo -# uses: actions/checkout@v3 -# -# - name: Install rimraf -# run: npm i -g rimraf@3.0.0 -# -# - name: Clear all previous examples versions -# run: mkdir -p examples && rimraf ./examples/* -# -# - uses: actions/download-artifact@v3 -# with: -# path: temp-artifact-workspace -# -# -# -# - name: Display structure of downloaded files -# run: ls -R - - -# - name: Commit changes -# id: commit_changes -# uses: EndBug/add-and-commit@v9 -# with: -# message: 'chore: generated latest ${{ matrix.example }} example' -# committer_name: GitHub Actions -# committer_email: 41898282+github-actions[bot]@users.noreply.github.com -# default_author: github_actions -# add: '*' - -# build: -# name: Create latest examples -# runs-on: ubuntu-latest -# outputs: -# commit_sha: ${{ steps.commit_changes.outputs.commit_long_sha }} -# steps: -# - name: Checkout Repo -# uses: actions/checkout@v3 -# -# - name: Setup Node.js 16.x -# uses: actions/setup-node@v3 -# with: -# node-version: 16.x -# -# - name: Install Dependencies -# run: yarn -# -# - name: Make .env.examples file -# run: | -# echo "${{ secrets.EXAMPLES_ENV_FILE }}" > .env.examples -# -# - name: Build Latest CLI and generate examples -# run: yarn examples -# -# - name: Commit changes -# id: commit_changes -# uses: EndBug/add-and-commit@v9 -# with: -# message: 'chore: generate latest examples' -# committer_name: GitHub Actions -# committer_email: 41898282+github-actions[bot]@users.noreply.github.com -# default_author: github_actions -# add: '*' -# -# - name: Display structure of directory pre zip -# run: ls -Ra -# -# - name: Zip build artifact -# run: zip app-build.zip ./.next -r -# -# - name: Display structure of directory post zip -# run: ls -Ra -# -# - name: Upload test results -# if: always() -# uses: actions/upload-artifact@v3 -# with: -# name: app-build -# path: ./app-build.zip -# -# run-unit-basic: -# name: Run unit tests for examples -# needs: build -# defaults: -# run: -# working-directory: examples/basic -# runs-on: ubuntu-latest -# steps: -# - uses: actions/checkout@v3 -# -# - uses: actions/download-artifact@v3 -# with: -# name: app-build -# -# - name: Display structure of downloaded files pre unzip -# run: ls -R -# -# - name: unzip build artifact -# run: unzip app-build.zip -# -# - name: Display structure of downloaded files post unzip -# run: ls -R -# -# - name: Run unit tests for latest examples -# run: yarn test:coverage -# - name: Upload test results -# if: always() -# uses: actions/upload-artifact@v3 -# with: -# name: coverage -# path: examples/basic/coverage -# -# - name: "Create a check run" -# if: ${{ needs.build.outputs.commit_sha }} -# uses: actions/github-script@v6 -# env: -# parameter_url: '${{ github.event.workflow_run.html_url }}' -# with: -# debug: ${{ secrets.ACTIONS_STEP_DEBUG || false }} -# script: | -# await github.rest.checks.create({ -# owner: context.repo.owner, -# repo: context.repo.repo, -# head_sha: "${{ needs.build.outputs.commit_sha }}", -# name: "Unit Tests", -# status: "completed", -# conclusion: "success", -# output: { -# title: "Unit Tests", -# summary: "my *check* summary", -# text: "my text", -# }, -# }); -# -# run-e2e-basic: -# name: Run e2e tests for examples -# needs: build -# defaults: -# run: -# working-directory: examples/basic -# runs-on: ubuntu-latest -# steps: -# - name: Checkout files -# uses: Bhacaz/checkout-files@v2 -# with: -# files: examples/basic -# branch: ${{ needs.build.outputs.commit_sha || github.sha }} -# -# - name: Make .env.test file -# run: | -# echo "${{ secrets.TEST_ENV_FILE }}" > .env.test -# -# - name: Install Dependencies -# run: yarn --ignore-scripts -# -# - name: Run e2e tests for latest examples -# run: yarn test:ci:e2e -# - name: Upload test results -# if: always() -# uses: actions/upload-artifact@v3 -# with: -# name: test-results -# path: examples/basic/test-results -# -# - name: "Create a check run" -# if: ${{ needs.build.outputs.commit_sha }} -# uses: actions/github-script@v6 -# env: -# parameter_url: '${{ github.event.workflow_run.html_url }}' -# with: -# debug: ${{ secrets.ACTIONS_STEP_DEBUG || false }} -# script: | -# await github.rest.checks.create({ -# owner: context.repo.owner, -# repo: context.repo.repo, -# head_sha: "${{ needs.build.outputs.commit_sha }}", -# name: "Generate Examples", -# status: "completed", -# conclusion: "success", -# output: { -# title: "Generate Examples", -# summary: "my *check* summary", -# text: "my text", -# }, -# }); + fail-on-error: true \ No newline at end of file diff --git a/package.json b/package.json index 453f33b6..d884bde6 100644 --- a/package.json +++ b/package.json @@ -16,8 +16,8 @@ "test": "turbo run test", "test:packages": "turbo run test --filter='./packages/*'", "test:watch": "turbo run test:watch", - "start:e2e": "turbo run start:e2e --filter='./examples/basic'", - "test:e2e": "NODE_ENV=test pnpm start:e2e & (sleep 5 && turbo run test:e2e --filter='./examples/basic' && kill $(lsof -t -i tcp:3000))", + "start:e2e": "turbo run start:e2e --filter='./examples/simple'", + "test:e2e": "NODE_ENV=test pnpm start:e2e & (sleep 5 && turbo run test:e2e --filter='./examples/simple' && kill $(lsof -t -i tcp:3000))", "build:cli": "turbo run build --filter=composable-cli...", "build:packages": "turbo run build --filter='./packages/*'", "ci:version": "changeset version && pnpm install --no-frozen-lockfile",