From 025fc87d7436b84e724992947340a3e89899b077 Mon Sep 17 00:00:00 2001 From: Scott Sundahl Date: Fri, 26 Jul 2024 13:51:29 -0600 Subject: [PATCH 1/4] yaml changes --- .github/workflows/secureSignal-cd.yaml | 57 ++++++++++++++++++-------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/.github/workflows/secureSignal-cd.yaml b/.github/workflows/secureSignal-cd.yaml index db91258..55b8825 100644 --- a/.github/workflows/secureSignal-cd.yaml +++ b/.github/workflows/secureSignal-cd.yaml @@ -1,5 +1,5 @@ -name: Release UID2 Secure Signal Package to CDN -run-name: ${{ github.action_ref == 'refs/head/main' && 'Release' || 'Publish Pre-release' }} UID2 Secure Signal Package to CDN by @${{ github.actor }} +name: Release UID2/EUID Secure Signal Package to CDN +run-name: ${{ github.action_ref == 'refs/head/main' && 'Release' || 'Publish Pre-release' }} UID2/EUID Secure Signal Package to CDN by @${{ github.actor }} on: push: @@ -16,13 +16,23 @@ jobs: outputs: is_any_file_modified: ${{ steps.verify.outputs.any_modified }} steps: - - uses: actions/checkout@v4 + - uses: actions/checkout@v4 - - name: Check for change to src/secureSignal.ts - id: verify - uses: tj-actions/changed-files@v41 - with: - files: src/secureSignal.ts + - name: Check for change to src/secureSignal_shared.ts + id: verify_shared + uses: tj-actions/changed-files@v41 + with: + files: src/secureSignal_shared.ts + - name: Check for change to src/secureSignalUid2.ts + id: verify_uid2 + uses: tj-actions/changed-files@v41 + with: + files: src/secureSignalUid2.ts + - name: Check for change to src/secureSignalEuid.ts + id: verify_euid + uses: tj-actions/changed-files@v41 + with: + files: src/secureSignalEuid.ts build: needs: [verify] if: needs.verify.outputs.is_any_file_modified == 'true' @@ -45,30 +55,45 @@ jobs: run: npm install - name: Build run: npm run build:esp -- --mode=${{ matrix.target }} - - uses: actions/upload-artifact@v4 + - name: Upload UID2 Secure Signals Files + uses: actions/upload-artifact@v4 with: - name: ${{ matrix.target }}SecureSignalScript + name: ${{ matrix.target }}Uid2SecureSignalScript path: ./dist/uid2SecureSignal.js - + - name: Upload EUID Secure Signals Files + uses: actions/upload-artifact@v4 + with: + name: ${{ matrix.target }}EuidSecureSignalScript + path: ./dist/euidSecureSignal.js + deployment: needs: [build] runs-on: ubuntu-latest permissions: id-token: write - + strategy: matrix: environment: [integ, production] environment: ${{ matrix.environment }} - + steps: - uses: actions/checkout@v4 - - uses: ./.github/actions/cdn_deployment_aws - with: + - name: Deploy UID2 Secure Signals to CDN + uses: ./.github/actions/cdn_deployment_aws + with: environment: ${{ matrix.environment }} - artifact: ${{ (matrix.environment == 'integ' && 'development') || matrix.environment }}SecureSignalScript + artifact: ${{ (matrix.environment == 'integ' && 'development') || matrix.environment }}Uid2SecureSignalScript invalidate_paths: '/uid2SecureSignal.js' aws_bucket_name: ${{ vars.S3_BUCKET }} aws_distribution_id: ${{ secrets.AWS_DISTRIBUTION_ID }} + - name: Deploy EUID Secure Signals to CDN + uses: ./.github/actions/cdn_deployment_aws + with: + environment: ${{ matrix.environment }} + artifact: ${{ (matrix.environment == 'integ' && 'development') || matrix.environment }}EuidSecureSignalScript + invalidate_paths: '/euidSecureSignal.js' + aws_bucket_name: ${{ vars.S3_BUCKET }} + aws_distribution_id: ${{ secrets.AWS_DISTRIBUTION_ID }} From 55ce3d43176571d16602567ab2faaa8179d7edd0 Mon Sep 17 00:00:00 2001 From: Scott Sundahl Date: Tue, 30 Jul 2024 14:08:29 -0600 Subject: [PATCH 2/4] rename for testing --- .github/workflows/secureSignal-cd.yaml | 12 ++++++------ webpack.config.js | 5 ++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/secureSignal-cd.yaml b/.github/workflows/secureSignal-cd.yaml index 55b8825..b9b9182 100644 --- a/.github/workflows/secureSignal-cd.yaml +++ b/.github/workflows/secureSignal-cd.yaml @@ -59,12 +59,12 @@ jobs: uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }}Uid2SecureSignalScript - path: ./dist/uid2SecureSignal.js + path: ./dist/uid2SecureSignal1.js - name: Upload EUID Secure Signals Files uses: actions/upload-artifact@v4 with: name: ${{ matrix.target }}EuidSecureSignalScript - path: ./dist/euidSecureSignal.js + path: ./dist/euidSecureSignal1.js deployment: needs: [build] @@ -86,7 +86,7 @@ jobs: with: environment: ${{ matrix.environment }} artifact: ${{ (matrix.environment == 'integ' && 'development') || matrix.environment }}Uid2SecureSignalScript - invalidate_paths: '/uid2SecureSignal.js' + invalidate_paths: '/uid2SecureSignal1.js' aws_bucket_name: ${{ vars.S3_BUCKET }} aws_distribution_id: ${{ secrets.AWS_DISTRIBUTION_ID }} - name: Deploy EUID Secure Signals to CDN @@ -94,6 +94,6 @@ jobs: with: environment: ${{ matrix.environment }} artifact: ${{ (matrix.environment == 'integ' && 'development') || matrix.environment }}EuidSecureSignalScript - invalidate_paths: '/euidSecureSignal.js' - aws_bucket_name: ${{ vars.S3_BUCKET }} - aws_distribution_id: ${{ secrets.AWS_DISTRIBUTION_ID }} + invalidate_paths: '/euidSecureSignal1.js' + aws_bucket_name: ${{ vars.EUID_S3_BUCKET }} + aws_distribution_id: ${{ secrets.EUID_AWS_DISTRIBUTION_ID }} diff --git a/webpack.config.js b/webpack.config.js index a308793..18a3460 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -2,16 +2,15 @@ const uid2Entrypoint = './src/uid2Sdk.ts'; const euidEntrypoint = './src/euidSdk.ts'; const espEntryPointUid2 = './src/secureSignalUid2.ts'; const espEntryPointEuid = './src/secureSignalEuid.ts'; -const espSharedEntryPoint = './src/secureSignal_shared.ts'; const espOutput = { 'uid2-secureSignals': { import: espEntryPointUid2, - filename: `uid2SecureSignal.js`, + filename: `uid2SecureSignal1.js`, }, 'euid-secureSignals': { import: espEntryPointEuid, - filename: `euidSecureSignal.js`, + filename: `euidSecureSignal1.js`, }, }; From 953c76670dd750639d803c4c843d9f9f2a4e4af5 Mon Sep 17 00:00:00 2001 From: Scott Sundahl Date: Tue, 30 Jul 2024 14:19:21 -0600 Subject: [PATCH 3/4] remove dead code --- src/secureSignal_shared.ts | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/secureSignal_shared.ts b/src/secureSignal_shared.ts index a34e8af..7fa8aa7 100644 --- a/src/secureSignal_shared.ts +++ b/src/secureSignal_shared.ts @@ -61,12 +61,6 @@ export class UidSecureSignalProvider { return window.__uid2!.getAdvertisingTokenAsync!.bind(window.__uid2); } } - - // if (window.__uid2 && 'getAdvertisingTokenAsync' in window.__uid2!) { - // return window.__uid2!.getAdvertisingTokenAsync!.bind(window.__uid2); - // } else if (window.__euid && 'getAdvertisingTokenAsync' in window.__euid!) { - // return window.__euid!.getAdvertisingTokenAsync!.bind(window.__euid); - // } }; public getUidAdvertisingTokenWithRetry = ( @@ -107,8 +101,6 @@ export class UidSecureSignalProvider { declare global { interface Window { googletag?: any; - //__uidSecureSignalProvider?: UidSecureSignalProvider; - //getUidAdvertisingToken?: () => Promise; } } From 3ca3dbb203fbcd5a0c3b6a26a9b2f2a09176c92b Mon Sep 17 00:00:00 2001 From: Scott Sundahl Date: Tue, 30 Jul 2024 14:26:09 -0600 Subject: [PATCH 4/4] no need to check changes on secureSignal_shared --- .github/workflows/secureSignal-cd.yaml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/secureSignal-cd.yaml b/.github/workflows/secureSignal-cd.yaml index b9b9182..53ca510 100644 --- a/.github/workflows/secureSignal-cd.yaml +++ b/.github/workflows/secureSignal-cd.yaml @@ -17,12 +17,6 @@ jobs: is_any_file_modified: ${{ steps.verify.outputs.any_modified }} steps: - uses: actions/checkout@v4 - - - name: Check for change to src/secureSignal_shared.ts - id: verify_shared - uses: tj-actions/changed-files@v41 - with: - files: src/secureSignal_shared.ts - name: Check for change to src/secureSignalUid2.ts id: verify_uid2 uses: tj-actions/changed-files@v41