diff --git a/.github/workflows/conty-autorelease.yml b/.github/workflows/conty-autorelease.yml index 1611814..cc40192 100644 --- a/.github/workflows/conty-autorelease.yml +++ b/.github/workflows/conty-autorelease.yml @@ -8,10 +8,26 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: checkout + uses: actions/checkout@v4 + with: + lfs: 'false' + + - name: Download artifact + id: download-artifact + uses: dawidd6/action-download-artifact@v6 + with: + workflow: utils.yml + workflow_conclusion: success + if_no_artifact_found: ignore + path: /opt - name: Build Conty run: | + if [ -f /opt/Utils/utils.tar.gz ]; then + cp /opt/Utils/* . + fi + chmod +x create-arch-bootstrap.sh create-conty.sh sudo ./create-arch-bootstrap.sh && ./create-conty.sh diff --git a/.github/workflows/conty.yml b/.github/workflows/conty.yml index 9a56e7a..6f9ec01 100644 --- a/.github/workflows/conty.yml +++ b/.github/workflows/conty.yml @@ -10,10 +10,26 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - name: checkout + uses: actions/checkout@v4 + with: + lfs: 'false' + + - name: Download artifact + id: download-artifact + uses: dawidd6/action-download-artifact@v6 + with: + workflow: utils.yml + workflow_conclusion: success + if_no_artifact_found: ignore + path: /opt - name: Build Conty run: | + if [ -f /opt/Utils/utils.tar.gz ]; then + cp /opt/Utils/* . + fi + chmod +x create-arch-bootstrap.sh create-conty.sh sudo ./create-arch-bootstrap.sh && ./create-conty.sh diff --git a/create-conty.sh b/create-conty.sh index 157c32b..5d89f5d 100755 --- a/create-conty.sh +++ b/create-conty.sh @@ -61,22 +61,14 @@ else fi if [ ! -f "${utils}" ] || [ "$(wc -c < "${utils}")" -lt 100000 ]; then - if [ -d .git ]; then - git lfs install - git lfs fetch origin master - git lfs checkout - fi + if git config --get remote.origin.url; then + utils_url="$(git config --get remote.origin.url)"/raw/"$(git rev-parse --abbrev-ref HEAD)"/${utils} + else + utils_url="https://github.com/Kron4ek/Conty/raw/master/${utils}" + fi - if [ ! -f "${utils}" ] || [ "$(wc -c < "${utils}")" -lt 100000 ]; then - if git config --get remote.origin.url; then - utils_url="$(git config --get remote.origin.url)"/raw/master/${utils} - else - utils_url="https://github.com/Kron4ek/Conty/raw/master/${utils}" - fi - - rm -f "${utils}" - curl -#LO "${utils_url}" - fi + rm -f "${utils}" + curl -#LO "${utils_url}" fi if [ ! -f conty-start.sh ]; then