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

Don't compress git files in caravel and mgmt_core_wrapper repos #77

Merged
merged 1 commit into from
Apr 20, 2022

Conversation

antonblanchard
Copy link
Contributor

make compress is trying to compress a large file in mgmt_core_wrapper
.git dir.

@d-m-bailey
Copy link
Contributor

@antonblanchard This pull request modifies 3 files. Is that what you intended? I think the main repo may have been updated after you created the branch. Maybe fetch upstream on github and then in your local repo

git fetch main
git pull main
git merge main
git push

Maybe.

@antonblanchard
Copy link
Contributor Author

It's some automated script that is getting applied to all of my PRs post creation:

    # Steps represent a sequence of tasks that will be executed as part of the job
    steps:
      # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
      - uses: actions/checkout@v2
      # Runs a single command using the runners shell
      - name: Run creating manifest
        run: make manifest
      - name: Set up Python
        uses: actions/setup-python@v2
        with:
          python-version: 3.6
      - name: Install dependencies
        run: python -m pip install --upgrade pip
      - name: Run creating README.rst
        run: make README.rst
      - uses: stefanzweifel/git-auto-commit-action@v4
        with:
          commit_message: Apply automatic changes to Manifest and README.rst
          # Optional commit user and author settings
          commit_user_name: My GitHub Actions Bot # defaults to "GitHub Actions"
          commit_user_email: my-github-actions-bot@example.org # defaults to "actions@github.com"

@antonblanchard
Copy link
Contributor Author

Looking at this closer, I think the issue is the caravel make install installs the mgmt engine into caravel_user_project/ instead of caravel_user_project/caravel/ if MCW_ROOT is not set

Copy link
Contributor

@RTimothyEdwards RTimothyEdwards left a comment

Choose a reason for hiding this comment

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

The fix for the Makefile is proper, but please make sure that your pull request does not include changes to README.rst (which overwrites a typo fix from Mitch) or manifest (which is auto-generated).

make compress is trying to compress a large file in mgmt_core_wrapper
.git dir.
@antonblanchard
Copy link
Contributor Author

@RTimothyEdwards Thanks for the review, I've rebased and the other files are now not getting updated.

FYI The issue is an automated script on pull request creation, and your recent commit just undid the typo:

8aafe0c#diff-7b3ed02bc73dc06b7db906cf97aa91dec2b2eb21f2d92bc5caa761df5bbc168fL155

@RTimothyEdwards
Copy link
Contributor

@antonblanchard : There is some automatic script that changes the manifest but also changes the README.rst and so undermines any attempt to fix the typo in that file. . . It automatically puts the typo back in.

Copy link
Contributor

@RTimothyEdwards RTimothyEdwards left a comment

Choose a reason for hiding this comment

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

Critically needed fix.

@RTimothyEdwards
Copy link
Contributor

@jeffdi : Please merge this ASAP. Hopefully it does not cause conflicts with changes to the Makefile in other pull requests.

@jeffdi jeffdi merged commit 660c9f4 into efabless:main Apr 20, 2022
M0stafaRady pushed a commit that referenced this pull request Sep 30, 2022
make compress is trying to compress a large file in mgmt_core_wrapper
.git dir.
@RTimothyEdwards RTimothyEdwards added error Something isn't working flow Makefile or in-repository flow script changed labels Oct 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
error Something isn't working flow Makefile or in-repository flow script changed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants