Skip to content

Commit

Permalink
Merge branch 'analogdevicesinc:main' into ad9375_support
Browse files Browse the repository at this point in the history
  • Loading branch information
trishaange01 authored Nov 14, 2023
2 parents 3d03595 + 8bcfac1 commit 81dd74d
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/test-pypi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: TestPyPI
on:
push:
branches:
- master
- main
jobs:
DeployTestPyPI:
runs-on: ubuntu-latest
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -118,10 +118,10 @@ jobs:
cd doc && make html
cd ..
DeployMasterDoc:
DeployMainDoc:
runs-on: ubuntu-latest
needs: [Test,Lint,Doc]
if: github.ref == 'refs/heads/master'
if: github.ref == 'refs/heads/main'

steps:
- uses: actions/checkout@v2
Expand All @@ -147,13 +147,13 @@ jobs:
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
publish_dir: ./doc/build/html
destination_dir: master
destination_dir: main

DeployDevelopmentDoc:
runs-on: ubuntu-latest
needs: [Test,Lint,Doc]
# Only run on pull requests to master and non-forks
if: github.event_name == 'pull_request' && github.base_ref == 'master' && ! github.event.pull_request.head.repo.fork
# Only run on pull requests to main and non-forks
if: github.event_name == 'pull_request' && github.base_ref == 'main' && ! github.event.pull_request.head.repo.fork
steps:
- uses: actions/checkout@v2
- name: Set up Python 3.7
Expand Down
2 changes: 1 addition & 1 deletion adi/ad9081_mc.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@


def _map_to_dict(paths, ch, dev_name):
if "label" in ch.attrs and "buffer_only" in ch.attrs["label"].value:
if "->" not in ch.attrs["label"].value:
return paths, False
fddc, cddc, adc = ch.attrs["label"].value.split("->")
if dev_name not in paths.keys():
Expand Down
2 changes: 1 addition & 1 deletion adi/ad9084_mc.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@


def _map_to_dict(paths, ch, dev_name):
if "label" in ch.attrs and "buffer_only" in ch.attrs["label"].value:
if "->" not in ch.attrs["label"].value:
return paths, False
side, fddc, cddc, adc = ch.attrs["label"].value.replace(":", "->").split("->")
if dev_name not in paths.keys():
Expand Down

0 comments on commit 81dd74d

Please sign in to comment.