Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prdc winnipeg test run #194

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
88 changes: 2 additions & 86 deletions .github/workflows/2wr-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,99 +43,15 @@ jobs:
TWO_WEEKS_READY_E2E_TEST_PASSWORD: ${{ secrets.TWO_WEEKS_READY_E2E_TEST_PASSWORD }}
working-directory: ./2wr-app
- name: Upload e2e Test Results Recordings and Screenshots
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: failure()
with:
name: e2e-test-results
path: ./2wr-app/test-results
- name: Upload e2e Test Results Report
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v4
if: ${{ always() }}
with:
name: e2e-test-report
path: ./2wr-app/playwright-report
- name: Clear sample env file from e2e tests
run: 'rm ./2wr-app/.env'
- name: Write env file
run: 'echo "$DEV_ENV" > ./2wr-app/.env'
shell: bash
env:
DEV_ENV: ${{secrets.DEV_ENV}}
- run: npm run build
working-directory: ./2wr-app

deploy_to_dev:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

needs: build
if: github.event_name != 'pull_request'
environment: development
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
working-directory: ./2wr-app
- name: Write env file
run: 'echo "$DEV_ENV" > ./2wr-app/.env'
shell: bash
env:
DEV_ENV: ${{secrets.DEV_ENV}}
- run: npm run build
working-directory: ./2wr-app
- name: Azure Login
uses: azure/login@v1
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
- name: Azure Deploy Resources
uses: Azure/[email protected]
with:
inlineScript: |
chmod +x $GITHUB_WORKSPACE/az/deploy-frontend.sh
$GITHUB_WORKSPACE/az/deploy-frontend.sh -s $GITHUB_WORKSPACE/2wr-app/dist/

deploy_to_beta:
runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]

needs: deploy_to_dev
if: github.event_name != 'pull_request'
environment: beta
steps:
- uses: actions/checkout@v2
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
with:
node-version: ${{ matrix.node-version }}
- run: npm ci
working-directory: ./2wr-app
- name: Write env file
run: 'echo "$ENV" > ./2wr-app/.env'
shell: bash
env:
ENV: ${{secrets.ENV}}
- run: npm run build
working-directory: ./2wr-app
- name: Azure Login
uses: azure/login@v1
with:
client-id: ${{ secrets.AZURE_CLIENT_ID }}
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
- name: Azure Deploy Resources
uses: Azure/[email protected]
with:
inlineScript: |
chmod +x $GITHUB_WORKSPACE/az/deploy-frontend.sh
$GITHUB_WORKSPACE/az/deploy-frontend.sh -s $GITHUB_WORKSPACE/2wr-app/dist/ -r 2wr-beta-resources -e 2wrbeta
52 changes: 26 additions & 26 deletions 2wr-app/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion 2wr-app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"devDependencies": {
"@mdi/font": "^5.8.55",
"@playwright/test": "^1.40.0",
"@playwright/test": "^1.47.2",
"@vue/cli-plugin-babel": "^4.5.10",
"@vue/cli-plugin-eslint": "^4.5.10",
"@vue/cli-plugin-pwa": "^4.5.10",
Expand Down
2 changes: 1 addition & 1 deletion 2wr-app/src/components/prepare/hazards/hazard-info.vue
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<h2>{{item.name}} Safety</h2>
</v-col>
<v-col cols="12" class="text-center">
<v-btn x-large color="primary" width="80%" @click="beforeDialog = true">Before</v-btn>
<v-btn x-large color="primary" width="80%" @click="beforeDialog = false">Before</v-btn>
</v-col>
<v-col cols="12" class="text-center">
<v-btn x-large color="primary" width="80%" @click="duringDialog = true">During</v-btn>
Expand Down
2 changes: 1 addition & 1 deletion 2wr-app/src/components/welcome/welcome-landing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

<v-col v-if="stage === 1" cols="12" md="6" offset-md="3" class="text-left pa-6">
<h1 class="text-center text-uppercase text-h2">Welcome to 2 weeks ready</h1>
<p>
<p :style="{ color: '#BBBBBB'}">
<strong>2 Weeks Ready</strong> is a mobile application that makes
emergency preparedness a <strong>simple</strong>,
<strong>easy</strong>, <strong>sharable</strong>, and
Expand Down
Loading