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

MoMAGIC Ad Network - Vendor Registration #39956

Closed
wants to merge 49 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
dc304f7
Adding Momagic as Vendor
mmprebid Feb 20, 2024
7af426d
momagic as vednor, amp js added
mmprebid Mar 5, 2024
77a4404
Merge branch 'main' into saurabht
mmprebid Mar 5, 2024
abffbf2
momagic as vednor, amp js updated
mmprebid Mar 13, 2024
490ff4c
Merge branch 'main' into saurabht
mmprebid Mar 13, 2024
b23025b
momagic as vednor, amp js updated
mmprebid Mar 13, 2024
cd13567
Add .circleci/config.yml
mmprebid Mar 14, 2024
3398080
Merge branch 'ampproject:main' into main
mmprebid Mar 14, 2024
3a37b7d
Vendor Registeration, Momagic Js Updated
mmprebid Mar 14, 2024
4c8c4d2
Vendor Registeration, _config preconnect url updated for momagic
mmprebid Mar 14, 2024
fe3e664
Merge branch 'ampproject:main' into main
mmprebid Mar 26, 2024
e3d2f30
Reverted the vscode settings.json
mmprebid Mar 26, 2024
4b0a722
Merge branch 'ampproject:main' into main
mmprebid Mar 27, 2024
2dbca73
Maitained Alphabetical Order in amp-ad.md and reverted changes in in…
mmprebid Mar 27, 2024
3e0fb6e
Merge branch 'ampproject:main' into main
mmprebid Mar 28, 2024
0a01eab
Update alphabetical order in amp-ad.md for momagic
mmprebid Mar 28, 2024
c712017
Merge branch 'ampproject:main' into main
mmprebid Apr 8, 2024
3e6fd70
Merge branch 'main' into circleci-project-setup
mmprebid Apr 8, 2024
4d88743
Update .vscode/settings.json
powerivq Apr 8, 2024
828035e
Update settings.json
mmprebid Apr 9, 2024
8952b22
Merge branch 'ampproject:main' into main
mmprebid Apr 9, 2024
ebcb219
Update momagic.js
mmprebid Apr 9, 2024
04917c2
Merge branch 'ampproject:main' into main
mmprebid Apr 10, 2024
5fb215f
Merge branch 'ampproject:main' into master
mmprebid Apr 12, 2024
d799ed7
Merge branch 'ampproject:main' into main
mmprebid Apr 12, 2024
033816e
Merge branch 'ampproject:main' into circleci-project-setup
mmprebid Apr 12, 2024
826cf42
Updated config.yml
mmprebid Apr 12, 2024
09103fe
Add .circleci/config.yml
mmprebid Apr 15, 2024
3f96f8c
Updated config.yml
mmprebid Apr 15, 2024
81c9b67
Merge branch 'main'
mmprebid Apr 15, 2024
dff1d0e
Updated config.yml
mmprebid Apr 15, 2024
273a431
Updated config.yml
mmprebid Apr 15, 2024
9facf18
Updated config.yml
mmprebid Apr 15, 2024
7a5fa2c
cicircle branch update
mmprebid Apr 15, 2024
4da92bf
reverted cicircle branch
mmprebid Apr 15, 2024
7d3827a
Merge branch 'ampproject:main' into saurabht
mmprebid Apr 15, 2024
e609a56
Merge branch 'saurabht' of github.com:mmprebid/amphtml into saurabht
mmprebid Apr 15, 2024
4016bcd
Merge branch 'saurabht'
mmprebid Apr 15, 2024
f259693
amp vendor as Momagic
mmprebid Apr 16, 2024
3df3f27
Merge branch 'ampproject:main' into main
mmprebid Apr 16, 2024
2457c25
Merge branch 'ampproject:main' into master
mmprebid Apr 16, 2024
96177db
Adding Momagic as Vendor
mmprebid Apr 16, 2024
fdb3efb
Merge branch 'main'
mmprebid Apr 16, 2024
5c24f4e
Merge branch 'main' into circleci-project-setup
mmprebid Apr 16, 2024
d831711
Adding Momagic as Vendor
mmprebid Apr 16, 2024
b156c1f
Merge branch 'saurabht'
mmprebid Apr 16, 2024
3953318
Merge branch 'main'
mmprebid Apr 16, 2024
4589f93
local changes
mmprebid Apr 16, 2024
ae0fc59
local changes
mmprebid Apr 16, 2024
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
Empty file modified .circleci/check_config.sh
100755 → 100644
Empty file.
270 changes: 15 additions & 255 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -1,85 +1,22 @@
# Use the latest 2.1 version of CircleCI pipeline process engine.
# See: https://circleci.com/docs/configuration-reference
version: 2.1

orbs:
browser-tools: circleci/[email protected]
codecov: codecov/[email protected]
node: circleci/[email protected]

push_and_pr_builds: &push_and_pr_builds
filters:
branches:
ignore:
- nightly

release_builds_only: &release_builds_only
filters:
branches:
only:
- nightly
- /^amp-release-.*$/

experiment_job: &experiment_job
parameters:
exp:
description: 'Which of the three (A/B/C) experiments to use'
type: enum
enum: ['A', 'B', 'C']
environment:
FLAVOR: experiment<< parameters.exp >>

dist_job: &dist_job
parameters:
module:
description: 'Whether to build Module or Nomodule'
type: enum
enum: ['Module', 'Nomodule']
purpose:
description: 'What is the downstream purpose of this build'
type: enum
enum: ['Test', 'Bundle Size']

test_types_job: &test_types_job
parameters:
test_type:
description: 'Which test type to run'
type: enum
enum: ['Unit', 'Integration', 'End-to-End']

executors:
base-docker-small:
# Define a job to be invoked later in a workflow.
# See: https://circleci.com/docs/jobs-steps/#jobs-overview & https://circleci.com/docs/configuration-reference/#jobs
jobs:
say-hello:
# Specify the execution environment. You can specify an image from Docker Hub or use one of our convenience images from CircleCI's Developer Hub.
# See: https://circleci.com/docs/executor-intro/ & https://circleci.com/docs/configuration-reference/#executor-job
docker:
# Specify the version you desire here
# See: https://circleci.com/developer/images/image/cimg/base
- image: cimg/base:current
resource_class: small
node-docker-medium:
docker:
- image: cimg/node:lts-browsers
resource_class: medium
node-docker-large:
docker:
- image: cimg/node:lts-browsers
resource_class: large
node-docker-xlarge:
docker:
- image: cimg/node:lts-browsers
resource_class: xlarge
jdk-docker-2xlarge:
docker:
- image: cimg/openjdk:21.0.2-node
resource_class: 2xlarge
macos-medium:
macos:
xcode: 14.3.1
resource_class: macos.x86.medium.gen2

commands:
checkout_repo:
# Add steps to the job
# See: https://circleci.com/docs/jobs-steps/#steps-overview & https://circleci.com/docs/configuration-reference/#steps
steps:
- restore_cache:
name: '♻️ Restore Git Cache'
keys:
- git-cache-{{ arch }}-v3-main-{{ .Revision }}
- git-cache-{{ arch }}-v3-main-
- git-cache-{{ arch }}-v3-
# Checkout the code as the first step.
- checkout
- when:
condition:
Expand Down Expand Up @@ -203,7 +140,7 @@ commands:
- when:
condition:
matches:
pattern: ^main|amp-release-.*$
pattern: ^master|amp-release-.*$
value: << pipeline.git.branch >>
steps:
- run:
Expand Down Expand Up @@ -523,181 +460,4 @@ workflows:

'CircleCI':
jobs:
- initialize_repository:
name: 'Initialize Repository'
<<: *push_and_pr_builds
- initialize_mac_os:
name: 'Initialize for Mac OS'
<<: *push_and_pr_builds
- checks:
name: 'Checks'
<<: *push_and_pr_builds
requires:
- 'Initialize Repository'
- unminified_build:
name: 'Unminified Build (Test)'
<<: *push_and_pr_builds
requires:
- 'Initialize Repository'
- dist:
matrix:
parameters:
module: ['Module', 'Nomodule']
purpose: ['Test', 'Bundle Size']
name: '⛓️ << matrix.module >> Build (<< matrix.purpose >>)'
<<: *push_and_pr_builds
requires:
- 'Initialize Repository'
- dist_3p:
matrix:
parameters:
module: ['Module', 'Nomodule']
purpose: ['Test', 'Bundle Size']
name: '<< matrix.module >> 3p Build (<< matrix.purpose >>)'
<<: *push_and_pr_builds
requires:
- 'Initialize Repository'
- bundle_size:
name: 'Bundle Size'
<<: *push_and_pr_builds
requires:
- '⛓️ Nomodule Build (Bundle Size)'
- 'Nomodule 3p Build (Bundle Size)'
- '⛓️ Module Build (Bundle Size)'
- 'Module 3p Build (Bundle Size)'
- validator_tests:
name: 'Validator Tests'
<<: *push_and_pr_builds
requires:
- 'Initialize Repository'
- visual_diff_tests:
name: 'Visual Diff Tests'
<<: *push_and_pr_builds
requires:
- '⛓️ Module Build (Test)'
- 'Module 3p Build (Test)'
- '⛓️ Nomodule Build (Test)'
- 'Nomodule 3p Build (Test)'
- local_unit_tests:
name: 'Local Unit Tests'
<<: *push_and_pr_builds
requires:
- 'Initialize Repository'
- all_unit_tests:
name: '⛓️ All Unit Tests'
<<: *push_and_pr_builds
requires:
- 'Local Unit Tests'
- unminified_tests:
name: 'Unminified Tests'
<<: *push_and_pr_builds
requires:
- 'Unminified Build (Test)'
- nomodule_tests:
name: 'Nomodule Tests (<< matrix.config >>)'
matrix:
parameters:
config: ['prod', 'canary']
<<: *push_and_pr_builds
requires:
- '⛓️ Nomodule Build (Test)'
- 'Nomodule 3p Build (Test)'
- module_tests:
name: 'Module Tests (<< matrix.config >>)'
matrix:
parameters:
config: ['prod', 'canary']
<<: *push_and_pr_builds
requires:
- '⛓️ Module Build (Test)'
- 'Module 3p Build (Test)'
- '⛓️ Nomodule Build (Test)'
- 'Nomodule 3p Build (Test)'
- end_to_end_tests:
name: '⛓️ End-to-End Tests'
<<: *push_and_pr_builds
requires:
- '⛓️ Nomodule Build (Test)'
- 'Nomodule 3p Build (Test)'
- browser_tests_safari:
name: '<< matrix.test_type >> Tests (Safari)'
matrix:
parameters:
test_type: ['Unit', 'Integration', 'End-to-End']
<<: *push_and_pr_builds
requires:
- 'Initialize for Mac OS'
- '⛓️ Nomodule Build (Test)'
- 'Nomodule 3p Build (Test)'
- browser_tests_firefox:
name: '<< matrix.test_type >> Tests (Firefox)'
matrix:
parameters:
test_type: ['Unit', 'Integration', 'End-to-End']
<<: *push_and_pr_builds
requires:
- '⛓️ Nomodule Build (Test)'
- 'Nomodule 3p Build (Test)'
- browser_tests_edge:
name: '<< matrix.test_type >> Tests (Edge)'
matrix:
parameters:
# Note: we can't run e2e tests on Edge.
test_type: ['Unit', 'Integration']
<<: *push_and_pr_builds
requires:
- '⛓️ Nomodule Build (Test)'
- 'Nomodule 3p Build (Test)'
- experiment_build:
name: 'Experiment << matrix.exp >> Build'
matrix:
parameters:
exp: ['A', 'B', 'C']
<<: *push_and_pr_builds
requires:
- 'Initialize Repository'
- experiment_integration_tests:
name: 'Exp. << matrix.exp >> Integration Tests'
matrix:
parameters:
exp: ['A', 'B', 'C']
<<: *push_and_pr_builds
requires:
- 'Experiment << matrix.exp >> Build'
- experiment_end_to_end_tests:
name: '⛓️ Exp. << matrix.exp >> End-to-End Tests'
matrix:
parameters:
exp: ['A', 'B', 'C']
<<: *push_and_pr_builds
requires:
- 'Experiment << matrix.exp >> Build'

'Release':
jobs:
- initialize_repository:
name: 'Initialize Repository'
<<: *release_builds_only
- amp_release:
name: '<< matrix.flavor >> << matrix.esm >>'
matrix:
parameters:
flavor: ['base', 'experimentA', 'experimentB', 'experimentC']
esm: ['no-esm', 'esm']
<<: *release_builds_only
requires:
- 'Initialize Repository'
- upload_release:
name: 'Upload Release'
<<: *release_builds_only
requires:
- amp_release
context:
- release-build-uploader
- trigger_promote:
name: 'Trigger Promote'
<<: *release_builds_only
requires:
- 'Upload Release'
context:
- release-build-uploader
- say-hello
Empty file modified .circleci/fetch_merge_commit.sh
100755 → 100644
Empty file.
Empty file modified .circleci/get_pinned_chrome_version.sh
100755 → 100644
Empty file.
Empty file modified .circleci/get_pr_number.sh
100755 → 100644
Empty file.
Empty file modified .circleci/initialize_repo.sh
100755 → 100644
Empty file.
Empty file modified .circleci/install_microsoft_edge.sh
100755 → 100644
Empty file.
Empty file modified .circleci/install_validator_dependencies.sh
100755 → 100644
Empty file.
Empty file modified .circleci/maybe_gracefully_halt.sh
100755 → 100644
Empty file.
Empty file modified .circleci/restore_build_output.sh
100755 → 100644
Empty file.
8 changes: 8 additions & 0 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,12 +38,20 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
<<<<<<< HEAD
uses: github/codeql-action/init@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
=======
uses: github/codeql-action/init@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
>>>>>>> origin/master
with:
config-file: ./.github/codeql/config.yml
languages: ${{ matrix.language }}

- name: Perform CodeQL Analysis
<<<<<<< HEAD
uses: github/codeql-action/analyze@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
=======
uses: github/codeql-action/analyze@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
>>>>>>> origin/master
with:
category: '/language:${{matrix.language}}'
Empty file modified .github/workflows/install_dependencies.sh
100755 → 100644
Empty file.
4 changes: 4 additions & 0 deletions .github/workflows/scorecard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: 'Upload to code-scanning'
<<<<<<< HEAD
uses: github/codeql-action/upload-sarif@4355270be187e1b672a7a1c7c7bae5afdc1ab94a # v3.24.10
=======
uses: github/codeql-action/upload-sarif@df5a14dc28094dc936e103b37d749c6628682b60 # v3.25.0
>>>>>>> origin/master
with:
sarif_file: results.sarif
12 changes: 12 additions & 0 deletions 3p/vendors/momagic.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// src/polyfills.js must be the first import.
import '#3p/polyfills';

import {register} from '#3p/3p';
import {draw3p, init} from '#3p/integration-lib';

import {momagic} from '#ads/vendors/momagic';

init(window);
register('momagic', momagic);

window.draw3p = draw3p;
5 changes: 5 additions & 0 deletions ads/_config.js
100755 → 100644
Original file line number Diff line number Diff line change
Expand Up @@ -872,6 +872,11 @@ const adConfig = jsonConfiguration({
preconnect: ['https://player1.mixpo.com', 'https://player2.mixpo.com'],
},

'momagic': {
prefetch: 'https://securepubads.g.doubleclick.net/tag/js/gpt.js',
preconnect: ['https://amp.truereach.co.in/'],
},

'monetizer101': {
renderStartImplemented: true,
},
Expand Down
Empty file modified ads/vendors/adagio.js
100755 → 100644
Empty file.
Empty file modified ads/vendors/adagio.md
100755 → 100644
Empty file.
Empty file modified ads/vendors/adop.js
100755 → 100644
Empty file.
Empty file modified ads/vendors/adop.md
100755 → 100644
Empty file.
Empty file modified ads/vendors/improvedigital.js
100755 → 100644
Empty file.
Empty file modified ads/vendors/improvedigital.md
100755 → 100644
Empty file.
Loading