From 5f9c7905078d90cbd99fdd776f1df8b8c2adff68 Mon Sep 17 00:00:00 2001 From: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com> Date: Tue, 27 Oct 2020 18:14:39 +0000 Subject: [PATCH] [Hopefully] the final DMAPI updater fix (#14750) * I hate github actions * this for good measure * More good measure changes * work please * Double sudo * I dont have all day * Lets just remove this step * Throw in attributes for good measure * No longer required * FINAL:tm: * License --- .github/workflows/update_tgs_dmapi.yml | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/.github/workflows/update_tgs_dmapi.yml b/.github/workflows/update_tgs_dmapi.yml index 760b6dc9064..d46096e8ac8 100644 --- a/.github/workflows/update_tgs_dmapi.yml +++ b/.github/workflows/update_tgs_dmapi.yml @@ -15,12 +15,10 @@ jobs: - name: Branch run: | + git fetch origin git branch -f tgs-dmapi-update git checkout tgs-dmapi-update - git reset --hard master - - - name: Install Deps - run: sudo apt install dos2unix + git reset --hard origin/master - name: Apply DMAPI update uses: tgstation/tgs-dmapi-updater@v2 @@ -28,14 +26,13 @@ jobs: header-path: 'code/__DEFINES/tgs.dm' library-path: 'code/modules/tgs' - - name: Convert From CRLF To LF - run: | - dos2unix code/__DEFINES/tgs.dm - find code/modules/tgs -type f -print0 | xargs -0 dos2unix -- - - name: Commit and Push run: | - git config --local core.eol lf + echo '*.dm text eol=lf' >> .gitattributes + echo '*.md text eol=lf' >> .gitattributes + echo '*LICENSE text eol=lf' >> .gitattributes + git config --global core.autocrlf false + git config --global core.eol lf git config --local user.email "action@github.com" git config --local user.name "DMAPI Update" git add .