diff --git a/.github/workflows/bundle-size.yml b/.github/workflows/bundle-size.yml index 497702ff5..47afa48c2 100644 --- a/.github/workflows/bundle-size.yml +++ b/.github/workflows/bundle-size.yml @@ -10,19 +10,20 @@ jobs: runs-on: ubuntu-latest env: TURBO_API: 'http://127.0.0.1:9080' - TURBO_TOKEN: ${{ secrets.TURBO_SERVER_TOKEN }} + TURBO_TOKEN: 'turbo-token' TURBO_TEAM: ${{ github.repository_owner }} steps: - - uses: actions/checkout@v3 + - name: ๐Ÿ“ฅ Checkout code + uses: actions/checkout@v3 - - name: Setup a local cache server for Turborepo + - name: ๐Ÿš€ Setup a local cache server for Turborepo uses: felixmosh/turborepo-gh-artifacts@v3 with: repo-token: ${{ secrets.GITHUB_TOKEN }} server-token: ${{ env.TURBO_TOKEN }} - - name: Compute bundle size report + - name: ๐Ÿ“Š Compute bundle size report uses: preactjs/compressed-size-action@v2 with: repo-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0053f77e3..b41667a36 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,7 +11,7 @@ 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: @@ -23,35 +23,35 @@ 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: 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: Run lint, type checks and tests + - name: ๐Ÿงช Run lint, type checks and tests run: yarn verify - - name: Run build + - name: ๐Ÿ—๏ธ Run build run: yarn turbo run build --concurrency=5 - - name: Upload build artifacts + - name: ๐Ÿ“ค Upload build artifacts uses: actions/upload-artifact@v4 with: name: packages @@ -68,38 +68,40 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup Node.js + - name: ๐ŸŸข Setup Node.js uses: actions/setup-node@v4 with: node-version: "18" registry-url: "https://registry.npmjs.org" - - 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: ๐Ÿท๏ธ Version run: yarn workspaces foreach --worktree --topological --exclude @openmrs/esm-patient-management 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 --concurrency=5 - - run: git config user.email "info@openmrs.org" && git config user.name "OpenMRS CI" - - run: git add . && git commit -m "Prerelease version" --no-verify + - name: ๐Ÿ”ง Configure Git + run: git config user.email "info@openmrs.org" && git config user.name "OpenMRS CI" + - name: ๐Ÿ’พ Commit changes + 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 run ci:prepublish env: NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }} - - name: Upload Artifacts + - name: ๐Ÿ“ค Upload Artifacts uses: actions/upload-artifact@v4 with: name: packages @@ -116,20 +118,20 @@ jobs: steps: - uses: actions/checkout@v4 - - name: Setup Node.js + - name: ๐ŸŸข Setup Node.js uses: actions/setup-node@v4 with: node-version: "18" registry-url: "https://registry.npmjs.org" - - 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 @@ -146,7 +148,7 @@ jobs: if: ${{ github.event_name == 'push' }} steps: - - name: Trigger RefApp Build + - name: ๐Ÿ”„ Trigger RefApp Build uses: fjogeleit/http-request-action@v1 continue-on-error: true with: diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 0fe17a925..1013ecbf0 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -10,7 +10,7 @@ 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: @@ -18,33 +18,33 @@ jobs: 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 uses: actions/cache@v4 id: playwright-cache with: @@ -52,33 +52,33 @@ jobs: ~/.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 apps + - name: ๐Ÿ—๏ธ Build apps run: yarn turbo run build --color --concurrency=5 - - 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: diff --git a/packages/esm-bed-management-app/translations/en.json b/packages/esm-bed-management-app/translations/en.json index c85ffb050..dba1d2c0e 100644 --- a/packages/esm-bed-management-app/translations/en.json +++ b/packages/esm-bed-management-app/translations/en.json @@ -15,7 +15,6 @@ "bedTagPlaceholder": "", "bedType": "Add Bed Type", "bedTypePlaceholder": "", - "cancel": "Cancel", "checkFilters": "Check the filters above", "chooseBedtype": "Choose a bed type", "chooseOccupiedStatus": "Choose occupied status",