Skip to content

Commit

Permalink
merge main into
Browse files Browse the repository at this point in the history
  • Loading branch information
Nina Ciocanu committed May 8, 2024
2 parents afd87b1 + 1e28ab6 commit 655a03b
Show file tree
Hide file tree
Showing 172 changed files with 23,480 additions and 45,311 deletions.
14 changes: 0 additions & 14 deletions .babelrc

This file was deleted.

79 changes: 0 additions & 79 deletions .eslintrc.js

This file was deleted.

44 changes: 22 additions & 22 deletions .github/workflows/codeql-analysis.yml
Expand Up @@ -2,12 +2,12 @@ name: "CodeQL"

on:
push:
branches: [ main ]
branches: [main]
pull_request:
# The branches below must be a subset of the branches above
branches: [ main ]
branches: [main]
schedule:
- cron: '26 7 * * 3'
- cron: "26 7 * * 3"

jobs:
analyze:
Expand All @@ -21,30 +21,30 @@ jobs:
strategy:
fail-fast: false
matrix:
language: [ 'javascript' ]
language: ["javascript"]

steps:
- name: Checkout repository
uses: actions/checkout@v2
- name: Checkout repository
uses: actions/checkout@v4

- name: Initialize CodeQL
uses: github/codeql-action/init@v2
with:
languages: ${{ matrix.language }}
- name: Initialize CodeQL
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}

- name: Autobuild
uses: github/codeql-action/autobuild@v2
- name: Autobuild
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl

# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project
# uses a compiled language

#- run: |
# make bootstrap
# make release
#- run: |
# make bootstrap
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3
20 changes: 10 additions & 10 deletions .github/workflows/deployRelease.yml
Expand Up @@ -27,18 +27,18 @@ jobs:
# final release versions do not contain '-'
if: ${{ contains(github.event.inputs.version, '-') == false }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
- uses: webfactory/ssh-agent@v0.5.3
node-version: 21
- uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.ALLOY_BOT_GITHUB_SSH_PRIVATE_KEY }}
- run: ./scripts/deploy.sh ${{ github.event.inputs.version }}
env:
REACTOR_IO_INTEGRATION_PRIVATE_KEY_CONTENTS: ${{ secrets.REACTOR_IO_INTEGRATION_PRIVATE_KEY_CONTENTS }}
REACTOR_IO_INTEGRATION_CLIENT_SECRET: ${{ secrets.REACTOR_IO_INTEGRATION_CLIENT_SECRET }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: package
path: ./package-adobe-alloy-${{ github.event.inputs.version }}.zip
Expand All @@ -49,18 +49,18 @@ jobs:
# prerelease versions contain '-'
if: ${{ contains(github.event.inputs.version, '-') }}
steps:
- uses: actions/checkout@v2
- uses: actions/setup-node@v1
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: 16
- uses: webfactory/ssh-agent@v0.5.3
node-version: 21
- uses: webfactory/ssh-agent@v0.9.0
with:
ssh-private-key: ${{ secrets.ALLOY_BOT_GITHUB_SSH_PRIVATE_KEY }}
- run: ./scripts/deploy.sh ${{ github.event.inputs.version }}
env:
REACTOR_IO_INTEGRATION_PRIVATE_KEY_CONTENTS: ${{ secrets.REACTOR_IO_INTEGRATION_PRIVATE_KEY_CONTENTS }}
REACTOR_IO_INTEGRATION_CLIENT_SECRET: ${{ secrets.REACTOR_IO_INTEGRATION_CLIENT_SECRET }}
- uses: actions/upload-artifact@v2
- uses: actions/upload-artifact@v4
with:
name: package
path: ./package-adobe-alloy-${{ github.event.inputs.version }}.zip
Expand Down
15 changes: 6 additions & 9 deletions .github/workflows/tests.yml
Expand Up @@ -6,7 +6,7 @@ env:
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
SAUCE_JOB: "Alloy Reactor Extension"
SAUCE_CAPABILITIES_OVERRIDES_PATH: 'sauceLabsCapabilities.json'
SAUCE_CAPABILITIES_OVERRIDES_PATH: "sauceLabsCapabilities.json"
EDGE_E2E_PRIVATE_KEY_CONTENTS: ${{ secrets.EDGE_E2E_PRIVATE_KEY_CONTENTS }}
EDGE_E2E_CLIENT_SECRET: ${{ secrets.EDGE_E2E_CLIENT_SECRET }}
REACTOR_IO_INTEGRATION_PRIVATE_KEY_CONTENTS: ${{ secrets.REACTOR_IO_INTEGRATION_PRIVATE_KEY_CONTENTS }}
Expand All @@ -17,24 +17,22 @@ jobs:
name: "Unit Test"
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Install dependencies
run: npm ci
- name: Build
run: npm run build
- uses: saucelabs/sauce-connect-action@v2.2.1
- uses: saucelabs/sauce-connect-action@v2
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
tunnelName: ${{ github.job }}
- name: Run Unit Test
run: npx karma start karma.saucelabs.conf.js --single-run
env:
BUILD_NUMBER: ${{ github.run_number }}
BUILD_ID: ${{ github.run_id }}
JOB_NUMBER: ${{ github.job }}


functional-test:
name: "Functional Test"
needs: unit-test
Expand All @@ -50,11 +48,11 @@ jobs:
]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2.1.4
- uses: actions/checkout@v4
- uses: actions/cache@v4
id: npm-cache
with:
path: '**/node_modules'
path: "**/node_modules"
key: ${{ runner.os }}-modules-${{ hashFiles('**/package-lock.json') }}-${{ secrets.NPM_CACHE_VERSION }} # increment NPM_CACHE_VERSION secret to force cache reset
- name: Install node packages
run: npm ci
Expand All @@ -70,4 +68,3 @@ jobs:
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
EDGE_E2E_PRIVATE_KEY_CONTENTS: ${{ secrets.EDGE_E2E_PRIVATE_KEY_CONTENTS }}
EDGE_E2E_CLIENT_SECRET: ${{ secrets.EDGE_E2E_CLIENT_SECRET }}

4 changes: 4 additions & 0 deletions .prettierrc.json
@@ -0,0 +1,4 @@
{
"trailingComma": "none",
"arrowParens": "avoid"
}
12 changes: 12 additions & 0 deletions babel.config.json
@@ -0,0 +1,12 @@
{
"plugins": ["version"],
"env": {
"production": {
"plugins": [
"babel-plugin-jsx-remove-data-test-id",
"@babel/plugin-transform-nullish-coalescing-operator",
"@babel/plugin-transform-optional-chaining"
]
}
}
}

0 comments on commit 655a03b

Please sign in to comment.