Skip to content

Commit

Permalink
Merge branch 'main' into PDCL-8332
Browse files Browse the repository at this point in the history
  • Loading branch information
shammowla committed Jan 16, 2025
2 parents 9f3db89 + 4e1c9a6 commit 10b2363
Show file tree
Hide file tree
Showing 391 changed files with 16,405 additions and 15,698 deletions.
29 changes: 0 additions & 29 deletions .github/workflows/build.yml

This file was deleted.

60 changes: 1 addition & 59 deletions .github/workflows/dev.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@ name: Alloy Dev
on:
pull_request:
workflow_dispatch:
env:
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}
SAUCE_JOB: "Alloy Dev Workflow"
SAUCE_CAPABILITIES_OVERRIDES_PATH: "sauceLabsCapabilities.json"
EDGE_BASE_PATH: ee-pre-prd
ALLOY_ENV: int
SAUCE_TUNNEL_ID: github-action-tunnel

jobs:
linting:
Expand Down Expand Up @@ -49,59 +41,9 @@ jobs:
- name: Install dependencies
if: steps.npm-cache.outputs.cache-hit != 'true'
run: npm ci
- name: Build
run: npm run test:functional:build:int
- uses: saucelabs/sauce-connect-action@v2
with:
username: ${{ secrets.SAUCE_USERNAME }}
accessKey: ${{ secrets.SAUCE_ACCESS_KEY }}
- name: Run Unit Test
run: npx karma start karma.saucelabs.conf.cjs --single-run
run: npm run test
env:
BUILD_NUMBER: $GITHUB_RUN_NUMBER
BUILD_ID: $GITHUB_RUN_ID
JOB_NUMBER: $GITHUB_JOB

alloy-int-e2e:
name: "Dev Functional Test - Saucectl"
runs-on: ubuntu-latest
needs: unit-test
timeout-minutes: 60
steps:
- name: Set up Node.js version
uses: actions/setup-node@v4
with:
node-version: 22

- uses: actions/checkout@v4

- name: Clear cache
uses: actions/cache@v4
id: npm-cache
with:
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: Store Alloy version into env
uses: nyaa8/package-version@v1

- name: Install dependencies
if: steps.npm-cache.outputs.cache-hit != 'true'
run: npm ci

- name: Build
run: npm run test:functional:build:int
env:
ALLOY_PROD_VERSION: ${{ env.PACKAGE_VERSION }}

- uses: saucelabs/[email protected]
env:
GITHUB_TOKEN: ${{ github.token }}
with:
sauce-username: ${{ secrets.SAUCE_USERNAME }}
sauce-access-key: ${{ secrets.SAUCE_ACCESS_KEY }}
env: |
ALLOY_PROD_VERSION=${{ env.PACKAGE_VERSION }}
NPM_PACKAGE_VERSION=${{ env.PACKAGE_VERSION }}
ALLOY_ENV=int
config-file: ./.sauce/dev.yml
3 changes: 0 additions & 3 deletions .github/workflows/publish-to-npm.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,5 @@
name: Publish To NPM
on: workflow_dispatch
env:
SAUCE_USERNAME: ${{ secrets.SAUCE_USERNAME }}
SAUCE_ACCESS_KEY: ${{ secrets.SAUCE_ACCESS_KEY }}

jobs:
publish-to-npm:
Expand Down
1 change: 0 additions & 1 deletion .husky/pre-commit
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
npm run checkthattestfilesexist
STAGED_ONLY=true npm run add-license
npx lint-staged
npm run test:unit
28 changes: 14 additions & 14 deletions .sauce/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,17 @@ suites:
- "test/functional/specs/**/*.js"
platformName: "Windows 11"
excludedTestFiles: ["test/functional/specs/Consent/C5594870.js"]
- name: "Chrome"
browserName: "chrome"
headless: true
browserVersion: "latest"
src:
- "test/functional/specs/**/*.js"
platformName: "Windows 11"
excludedTestFiles:
[
"test/functional/specs/Consent/C5594870.js",
"test/functional/specs/Personalization/C7494472.js",
"test/functional/specs/Personalization/C8631576.js",
"test/functional/specs/Personalization/C8631577.js",
]
# - name: "Chrome"
# browserName: "chrome"
# headless: true
# browserVersion: "latest"
# src:
# - "test/functional/specs/**/*.js"
# platformName: "Windows 11"
# excludedTestFiles:
# [
# "test/functional/specs/Consent/C5594870.js",
# "test/functional/specs/Personalization/C7494472.js",
# "test/functional/specs/Personalization/C8631576.js",
# "test/functional/specs/Personalization/C8631577.js",
# ]
12 changes: 0 additions & 12 deletions .sauceignore

This file was deleted.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
[![Alloy Main Branch | Konductor Prod](https://github.com/adobe/alloy/workflows/Pre-Deploy/badge.svg)](https://github.com/adobe/alloy/actions)
![Alloy Main Branch | Konductor Prod](https://github.com/adobe/alloy/actions/workflows/prod.yml/badge.svg)
![alloy](https://img.shields.io/bundlephobia/min/@adobe/alloy?logo=Adobe&style=for-the-badge)
![alloy](https://img.shields.io/bundlephobia/minzip/@adobe/alloy?logo=Adobe&style=for-the-badge)

# Alloy

Alloy is the code name for the Adobe Experience Platform Web SDK. It allows for recording events into Adobe Experience Platform, syncing identities, personalizing content, and more.

For documentation on how to use Alloy, please see the [user documentation](https://experienceleague.adobe.com/docs/experience-platform/edge/home.html).
For documentation on how to use Alloy, please see the [user documentation](https://experienceleague.adobe.com/en/docs/experience-platform/web-sdk/home).


## Contribution
Expand Down
87 changes: 0 additions & 87 deletions karma.conf.cjs

This file was deleted.

74 changes: 0 additions & 74 deletions karma.saucelabs.conf.cjs

This file was deleted.

Loading

0 comments on commit 10b2363

Please sign in to comment.