Skip to content

Commit

Permalink
Merge branch 'master' into remove-applogy
Browse files Browse the repository at this point in the history
  • Loading branch information
gargcreation1992 authored Sep 26, 2023
2 parents 085819d + 6738217 commit 271ab6c
Show file tree
Hide file tree
Showing 38 changed files with 798 additions and 1,437 deletions.
14 changes: 7 additions & 7 deletions .github/workflows/adapter-code-coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ jobs:
result-encoding: string
script: |
const utils = require('./.github/workflows/helpers/pull-request-utils.js')
function directoryExtractor(filepath) {
// extract directory name from filepath of the form adapters/<adapter-name>/*.go
if (filepath.startsWith("adapters/") && filepath.split("/").length > 2) {
function directoryExtractor(filepath, status) {
// extract directory name only if file is not removed and file is in adapters directory
if (status != "removed" && filepath.startsWith("adapters/") && filepath.split("/").length > 2) {
return filepath.split("/")[1]
}
return ""
Expand All @@ -41,7 +41,7 @@ jobs:
- name: Run coverage tests
id: run_coverage
if: ${{ steps.get_directories.outputs.result }} != ""
if: steps.get_directories.outputs.result != ''
run: |
directories=$(echo '${{ steps.get_directories.outputs.result }}' | jq -r '.[]')
go mod download
Expand Down Expand Up @@ -74,7 +74,7 @@ jobs:
repository: prebid/prebid-server

- name: Commit coverage files to coverage-preview branch
if: ${{ steps.run_coverage.outputs.coverage_dir }} != ""
if: steps.run_coverage.outputs.coverage_dir != ''
id: commit_coverage
run: |
directory=.github/preview/${{ github.run_id }}_$(date +%s)
Expand All @@ -88,11 +88,11 @@ jobs:
echo "remote_coverage_preview_dir=${directory}" >> $GITHUB_OUTPUT
- name: Checkout master branch
if: ${{ steps.get_directories.outputs.result }} != ""
if: steps.get_directories.outputs.result != ''
run: git checkout master

- name: Add coverage summary to pull request
if: ${{ steps.run_coverage.outputs.coverage_dir }} != "" && ${{ steps.commit_coverage.outputs.remote_coverage_preview_dir }} != ""
if: steps.run_coverage.outputs.coverage_dir != '' && steps.commit_coverage.outputs.remote_coverage_preview_dir != ''
uses: actions/github-script@v6
with:
script: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helpers/pull-request-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -213,8 +213,8 @@ class diffHelper {
})

const directories = []
for (const { filename } of data) {
const directory = directoryExtractor(filename)
for (const { filename, status } of data) {
const directory = directoryExtractor(filename, status)
if (directory != "" && !directories.includes(directory)) {
directories.push(directory)
}
Expand Down
57 changes: 0 additions & 57 deletions adapters/rhythmone/params_test.go

This file was deleted.

150 changes: 0 additions & 150 deletions adapters/rhythmone/rhythmone.go

This file was deleted.

20 changes: 0 additions & 20 deletions adapters/rhythmone/rhythmone_test.go

This file was deleted.

Loading

0 comments on commit 271ab6c

Please sign in to comment.