Skip to content

Conversation

@trupples
Copy link
Contributor

Based on the FTC 2024 workshop "Using ADI's Software Infrastructure to Sell ADCs, DACs, and Sensors​".

@thorenscientific
Copy link
Contributor

@gastmaier - consider this a "beta version", there will be updates, but it's workable as is (and we've been pointing people to @trupples ' fork for a while now, anticipating this being merged.)

Copy link
Collaborator

@gastmaier gastmaier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi,

Before merging I need you to rebase on main, renormalize lfs and force push.

Please read this instruction: https://analogdevicesinc.github.io/documentation/contributing/forking_publishing.html#fork
The rebase on main because I recently added more file extensions to be tracked by git lfs 5e47dbcccf, including .pptx.
Then, can you also add *.bin to .gitattributes to use lfs? Can be on the same commit

In other words, you need to:

# install git lfs
sudo apt install git-lfs -y
git lfs install --skip-smudge

# Fetch main from analogdevicesinc
git fetch public main

# Renormalize tracked pngs from your branch
git add --renormalize .
git commit --amend --no-edit

# Rebase on main
git rebase origin/main
# Update .gitattributes to include your desired new binary file types
echo "*.bin filter=lfs diff=lfs merge=lfs -text" >> .gitattributes
# Renormalize tracked binaries from your branch
git add --renormalize .
git commit --amend --no-edit

git push your_fork main:main

The skip-smudge instructs git lfs to not download tracked binaries on fetch.
And the reason for this is that adoc serve will download on demand the ones on the pages you load.
So let's say, the current checkout has 1 gB of binaries, and you are editing my_tutorial.rst, only tutorial_pic[123].png (5mB) will be downloaded.

thanks!

Co-authored-by: Mark Thoren <mark.thoren@analog.com>
Signed-off-by: Ioan Dragomir <ioan.dragomir@analog.com>
@trupples trupples requested a review from gastmaier March 20, 2025 09:57
Copy link
Collaborator

@gastmaier gastmaier left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you! you can merge now

@gastmaier gastmaier merged commit abfedbf into analogdevicesinc:main Mar 20, 2025
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants