Plemya-x/ALR
2
1
Fork 2
Code Issues 4 Pull Requests Actions Packages Projects 1 Releases 27 Wiki Activity

fix pull for multiple repos and temporary disabling building alr-bin packages #112

Merged
Maks1mS merged 2 commits from Maks1mS/ALR:fix-multiple-repos into master 2025-06-20 06:32:11 +00:00
Conversation 0 Commits 2 Files Changed 5 +69 -62
5 changed files with 69 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
.gitea/workflows/release.yaml
View File

@@ -84,31 +84,31 @@ jobs:
sed -i "s/version='[0-9]\+\.[0-9]\+\.[0-9]\+'/version='${{ env.VERSION }}'/g" alr-default/alr-bin/alr.sh sed -i "s/version='[0-9]\+\.[0-9]\+\.[0-9]\+'/version='${{ env.VERSION }}'/g" alr-default/alr-bin/alr.sh
sed -i "s/release='[0-9]\+'/release='1'/g" alr-default/alr-bin/alr.sh sed -i "s/release='[0-9]\+'/release='1'/g" alr-default/alr-bin/alr.sh
- name: Install alr # - name: Install alr
run: | # run: |
make install # make install
#
# # temporary fix
# groupadd wheel
# usermod -aG wheel root
# temporary fix # - name: Build packages
groupadd wheel # run: |
usermod -aG wheel root # SCRIPT_PATH=alr-default/alr-bin/alr.sh
# ALR_DISTRO=altlinux ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH"
# ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH"
# ALR_PKG_FORMAT=deb alr build -s "$SCRIPT_PATH"
# ALR_PKG_FORMAT=archlinux alr build -s "$SCRIPT_PATH"
- name: Build packages # - name: Upload assets
run: | # uses: akkuman/gitea-release-action@v1
SCRIPT_PATH=alr-default/alr-bin/alr.sh # with:
ALR_DISTRO=altlinux ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH" # body: ${{ steps.changes.outputs.changes }}
ALR_PKG_FORMAT=rpm alr build -s "$SCRIPT_PATH" # files: |-
ALR_PKG_FORMAT=deb alr build -s "$SCRIPT_PATH" # alr-bin+alr-default_${{ env.VERSION }}-1.red80_amd64.deb \
ALR_PKG_FORMAT=archlinux alr build -s "$SCRIPT_PATH" # alr-bin+alr-default-${{ env.VERSION }}-1-x86_64.pkg.tar.zst \
# alr-bin+alr-default-${{ env.VERSION }}-1.red80.x86_64.rpm \
- name: Upload assets # alr-bin+alr-default-${{ env.VERSION }}-alt1.x86_64.rpm
uses: akkuman/gitea-release-action@v1
with:
body: ${{ steps.changes.outputs.changes }}
files: |-
alr-bin+alr-default_${{ env.VERSION }}-1.red80_amd64.deb \
alr-bin+alr-default-${{ env.VERSION }}-1-x86_64.pkg.tar.zst \
alr-bin+alr-default-${{ env.VERSION }}-1.red80.x86_64.rpm \
alr-bin+alr-default-${{ env.VERSION }}-alt1.x86_64.rpm
- name: Commit changes - name: Commit changes
run: | run: |

4
assets/coverage-badge.svg
View File

@@ -11,7 +11,7 @@
<g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11"> <g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="11">
<text x="33.5" y="15" fill="#010101" fill-opacity=".3">coverage</text> <text x="33.5" y="15" fill="#010101" fill-opacity=".3">coverage</text>
<text x="33.5" y="14">coverage</text> <text x="33.5" y="14">coverage</text>
<text x="86" y="15" fill="#010101" fill-opacity=".3">18.8%</text> <text x="86" y="15" fill="#010101" fill-opacity=".3">18.9%</text>
<text x="86" y="14">18.8%</text> <text x="86" y="14">18.9%</text>
</g> </g>
</svg> </svg>
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 926 B

After

Width:  |  Height:  |  Size: 926 B

13
internal/repos/pull.go
View File

@@ -68,6 +68,16 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
} }
for _, repo := range repos { for _, repo := range repos {
err := rs.pullRepo(ctx, repo)
if err != nil {
return err
}
}
return nil
}
func (rs *Repos) pullRepo(ctx context.Context, repo types.Repo) error {
urls := []string{repo.URL} urls := []string{repo.URL}
urls = append(urls, repo.Mirrors...) urls = append(urls, repo.Mirrors...)
@@ -90,9 +100,6 @@ func (rs *Repos) Pull(ctx context.Context, repos []types.Repo) error {
} }
return fmt.Errorf("failed to pull repository %s from any URL: %w", repo.Name, lastErr) return fmt.Errorf("failed to pull repository %s from any URL: %w", repo.Name, lastErr)
}
return nil
} }
func readGitRepo(repoDir, repoUrl string) (*git.Repository, bool, error) { func readGitRepo(repoDir, repoUrl string) (*git.Repository, bool, error) {

12
internal/translations/default.pot
View File

@@ -383,27 +383,27 @@ msgstr ""
msgid "ERROR" msgid "ERROR"
msgstr "" msgstr ""
#: internal/repos/pull.go:78 #: internal/repos/pull.go:88
msgid "Trying mirror" msgid "Trying mirror"
msgstr "" msgstr ""
#: internal/repos/pull.go:84 #: internal/repos/pull.go:94
msgid "Failed to pull from URL" msgid "Failed to pull from URL"
msgstr "" msgstr ""
#: internal/repos/pull.go:151 #: internal/repos/pull.go:158
msgid "Pulling repository" msgid "Pulling repository"
msgstr "" msgstr ""
#: internal/repos/pull.go:188 #: internal/repos/pull.go:195
msgid "Repository up to date" msgid "Repository up to date"
msgstr "" msgstr ""
#: internal/repos/pull.go:223 #: internal/repos/pull.go:230
msgid "Git repository does not appear to be a valid ALR repo" msgid "Git repository does not appear to be a valid ALR repo"
msgstr "" msgstr ""
#: internal/repos/pull.go:239 #: internal/repos/pull.go:246
msgid "" msgid ""
"ALR repo's minimum ALR version is greater than the current version. Try " "ALR repo's minimum ALR version is greater than the current version. Try "
"updating ALR if something doesn't work." "updating ALR if something doesn't work."

20
internal/translations/po/ru/default.po
View File

@@ -12,8 +12,8 @@ msgstr ""
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Generator: Gtranslator 48.0\n" "X-Generator: Gtranslator 48.0\n"
#: build.go:42 #: build.go:42
@@ -356,8 +356,8 @@ msgid ""
"This command is deprecated and would be removed in the future, use \"%s\" " "This command is deprecated and would be removed in the future, use \"%s\" "
"instead!" "instead!"
msgstr "" msgstr ""
"Эта команда устарела и будет удалена в будущем, используйте вместо нее " "Эта команда устарела и будет удалена в будущем, используйте вместо нее \"%s"
"\"%s\"!" "\"!"
#: internal/db/db.go:76 #: internal/db/db.go:76
msgid "Database version mismatch; resetting" msgid "Database version mismatch; resetting"
@@ -397,27 +397,27 @@ msgstr "%s %s загружается — %s/с\n"
msgid "ERROR" msgid "ERROR"
msgstr "ОШИБКА" msgstr "ОШИБКА"
#: internal/repos/pull.go:78 #: internal/repos/pull.go:88
msgid "Trying mirror" msgid "Trying mirror"
msgstr "Пробую зеркало" msgstr "Пробую зеркало"
#: internal/repos/pull.go:84 #: internal/repos/pull.go:94
msgid "Failed to pull from URL" msgid "Failed to pull from URL"
msgstr "Не удалось извлечь из URL" msgstr "Не удалось извлечь из URL"
#: internal/repos/pull.go:151 #: internal/repos/pull.go:158
msgid "Pulling repository" msgid "Pulling repository"
msgstr "Скачивание репозитория" msgstr "Скачивание репозитория"
#: internal/repos/pull.go:188 #: internal/repos/pull.go:195
msgid "Repository up to date" msgid "Repository up to date"
msgstr "Репозиторий уже обновлён" msgstr "Репозиторий уже обновлён"
#: internal/repos/pull.go:223 #: internal/repos/pull.go:230
msgid "Git repository does not appear to be a valid ALR repo" msgid "Git repository does not appear to be a valid ALR repo"
msgstr "Репозиторий Git не поддерживается репозиторием ALR" msgstr "Репозиторий Git не поддерживается репозиторием ALR"
#: internal/repos/pull.go:239 #: internal/repos/pull.go:246
msgid "" msgid ""
"ALR repo's minimum ALR version is greater than the current version. Try " "ALR repo's minimum ALR version is greater than the current version. Try "
"updating ALR if something doesn't work." "updating ALR if something doesn't work."