Skip to content

Commit

Permalink
Added add Concept answer to EditMerge branch 'addConceptAnswer' of ht…
Browse files Browse the repository at this point in the history
  • Loading branch information
Willie-theBeastMutua committed Oct 2, 2024
2 parents 951e36f + ab7ff90 commit 85a5b11
Show file tree
Hide file tree
Showing 3 changed files with 76 additions and 66 deletions.
36 changes: 18 additions & 18 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,75 +10,75 @@ on:

env:
TURBO_API: 'http://127.0.0.1:9080'
TURBO_TOKEN: ${{ secrets.TURBO_SERVER_TOKEN }}
TURBO_TOKEN: 'turbo-token'
TURBO_TEAM: ${{ github.repository_owner }}

jobs:
run_e2e_tests:
runs-on: ubuntu-latest
timeout-minutes: 15
steps:
- name: Checkout repo
- name: 📥 Checkout repo
uses: actions/checkout@v4

- name: Copy test environment variables
- name: 📋 Copy test environment variables
run: cp example.env .env

- name: Setup node
- name: 🛠️ Setup node
uses: actions/setup-node@v4
with:
node-version: 18

- name: Cache dependencies
- name: 💾 Cache dependencies
id: cache-dependencies
uses: actions/cache@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
- name: 📦 Install dependencies
if: steps.cache-dependencies.outputs.cache-hit != 'true'
run: yarn install --immutable

- name: Get installed Playwright version
- name: 🔍 Get installed Playwright version
id: playwright-version
run: echo "PLAYWRIGHT_VERSION=$(grep '@playwright/test@' yarn.lock | sed -n 's/.*npm:\([^":]*\).*/\1/p' | head -n 1)" >> $GITHUB_ENV

- name: Cache Playwright binaries
- name: 💾 Cache Playwright binaries
id: playwright-cache
uses: actions/cache@v4
with:
path: |
~/.cache/ms-playwright
key: ${{ runner.os }}-playwright-${{ env.PLAYWRIGHT_VERSION }}

- name: Install Playwright Browsers
- name: 🎭 Install Playwright Browsers
run: npx playwright install chromium --with-deps
if: steps.playwright-cache.outputs.cache-hit != 'true'

- name: Setup local cache server for Turborepo
- name: 🚀 Setup local cache server for Turborepo
uses: felixmosh/turborepo-gh-artifacts@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}

- name: Build app
- name: 🏗️ Build app
run: yarn turbo run build --color

- name: Run dev server
- name: 🖥️ Run dev server
run: bash e2e/support/github/run-e2e-docker-env.sh

- name: Wait for OpenMRS instance to start
- name: Wait for OpenMRS instance to start
run: while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://localhost:8080/openmrs/login.htm)" != "200" ]]; do sleep 10; done

- name: Run E2E tests
- name: 🧪 Run E2E tests
run: yarn playwright test

- name: Stop dev server
- name: 🛑 Stop dev server
if: '!cancelled()'
run: docker stop $(docker ps -a -q)

- name: Upload Report
- name: 📤 Upload Report
uses: actions/upload-artifact@v4
if: always()
with:
Expand All @@ -87,13 +87,13 @@ jobs:
retention-days: 30
overwrite: true

- name: Capture Server Logs
- name: 📝 Capture Server Logs
if: always()
uses: jwalton/gh-docker-logs@v2
with:
dest: './logs'

- name: Upload Logs as Artifact
- name: 📦 Upload Logs as Artifact
uses: actions/upload-artifact@v4
if: always()
with:
Expand Down
104 changes: 57 additions & 47 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,48 +10,45 @@ on:
- created

env:
ESM_NAME: "@openmrs/esm-form-builder-app"
JS_NAME: "openmrs-esm-form-builder-app.js"
TURBO_API: 'http://127.0.0.1:9080'
TURBO_TOKEN: 'turbo-token'
TURBO_TEAM: ${{ github.repository_owner }}

jobs:
build:
runs-on: ubuntu-latest
env:
TURBO_API: 'http://127.0.0.1:9080'
TURBO_TOKEN: ${{ secrets.TURBO_SERVER_TOKEN }}
TURBO_TEAM: ${{ github.repository_owner }}

steps:
- uses: actions/checkout@v4
- name: Setup Node.js
- name: 🛠️ Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "18"

- name: Cache dependencies
- name: 💾 Cache dependencies
id: cache
uses: actions/cache@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
- name: 📦 Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --immutable

- name: Setup local cache server for Turborepo
- name: 🚀 Setup local cache server for Turborepo
uses: felixmosh/turborepo-gh-artifacts@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ secrets.TURBO_SERVER_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}

- name: Run tests, lint and typechecking
- name: 🧪 Run tests, lint and type checks
run: yarn verify

- name: Run build
- name: 🏗️ Run build
run: yarn turbo run build

- name: Upload Artifacts
- name: 📤 Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: dist
Expand All @@ -68,59 +65,51 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Setup Node.js
- name: 🛠️ Setup Node.js
uses: actions/setup-node@v4
with:
node-version: "18"

- name: Cache dependencies
- name: 💾 Cache dependencies
id: cache
uses: actions/cache@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
- name: 📦 Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --immutable

- name: Version
- name: 🚀 Setup local cache server for Turborepo
uses: felixmosh/turborepo-gh-artifacts@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}

- name: 🏷️ Version
run: yarn version "$(node -e "console.log(require('semver').inc(require('./package.json').version, 'patch'))")-pre.${{ github.run_number }}"

- name: Build
- name: 🏗️ Build
run: yarn turbo run build

- name: 🔧 Configure Git
run: git config user.email "[email protected]" && git config user.name "OpenMRS CI"
- name: 💾 Commit changes
run: git add . && git commit -m "Prerelease version" --no-verify

- run: git config user.email "[email protected]" && git config user.name "OpenMRS CI"
- run: git add . && git commit -m "Prerelease version" --no-verify

- name: Pre-release
- name: 🚀 Pre-release
run: yarn config set npmAuthToken "${NODE_AUTH_TOKEN}" && yarn npm publish --access public --tag next
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
- name: Upload Artifacts
- name: 📤 Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: dist
path: |
dist
overwrite: true

deploy_form_builder:
runs-on: ubuntu-latest

needs: pre_release

if: ${{ github.event_name == 'push' }}

steps:
- name: Trigger RefApp Build
uses: fjogeleit/http-request-action@v1
with:
url: https://ci.openmrs.org/rest/api/latest/queue/O3-BF
method: "POST"
customHeaders: '{ "Authorization": "Bearer ${{ secrets.BAMBOO_TOKEN }}" }'

release:
runs-on: ubuntu-latest

Expand All @@ -130,35 +119,56 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Download Artifacts

- name: 📥 Download Artifacts
uses: actions/download-artifact@v4
- name: Use Node.js
- name: 🛠️ Use Node.js
uses: actions/setup-node@v4
with:
node-version: "18"

- name: Cache dependencies
- name: 💾 Cache dependencies
id: cache
uses: actions/cache@v4
with:
path: '**/node_modules'
key: ${{ runner.os }}-${{ hashFiles('**/yarn.lock') }}

- name: Install dependencies
- name: 📦 Install dependencies
if: steps.cache.outputs.cache-hit != 'true'
run: yarn install --immutable

- name: Build
- name: 🚀 Setup local cache server for Turborepo
uses: felixmosh/turborepo-gh-artifacts@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
server-token: ${{ env.TURBO_TOKEN }}

- name: 🏗️ Build
run: yarn turbo run build
- run: yarn config set npmAuthToken "${NODE_AUTH_TOKEN}" && yarn npm publish --access public
- name: 🚀 Publish to NPM
run: yarn config set npmAuthToken "${NODE_AUTH_TOKEN}" && yarn npm publish --access public
env:
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}

- name: Upload Artifacts
- name: 📤 Upload Artifacts
uses: actions/upload-artifact@v4
with:
name: dist
path: |
dist
overwrite: true

deploy_form_builder:
runs-on: ubuntu-latest

needs: pre_release

if: ${{ github.event_name == 'push' }}

steps:
- name: 🚀 Trigger RefApp Build
uses: fjogeleit/http-request-action@v1
with:
url: https://ci.openmrs.org/rest/api/latest/queue/O3-BF
method: "POST"
customHeaders: '{ "Authorization": "Bearer ${{ secrets.BAMBOO_TOKEN }}" }'
2 changes: 1 addition & 1 deletion .github/workflows/size.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
steps:
- uses: actions/checkout@v4

- name: Compute bundle size differences
- name: 📏 Compute bundle size differences
uses: preactjs/compressed-size-action@v2
with:
repo-token: "${{ secrets.GITHUB_TOKEN }}"
Expand Down

0 comments on commit 85a5b11

Please sign in to comment.