Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
ci-common
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
postmarketOS
ci-common
Commits
2a85b31a
Unverified
Commit
2a85b31a
authored
6 months ago
by
Oliver Smith
Browse files
Options
Downloads
Patches
Plain Diff
gitlab.com -> gitlab.postmarketos.org
parent
666df6d1
No related branches found
No related tags found
No related merge requests found
Pipeline
#208059
canceled
6 months ago
Stage: test
Changes
3
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
README.md
+1
-1
1 addition, 1 deletion
README.md
check_mr_settings.py
+2
-2
2 additions, 2 deletions
check_mr_settings.py
install_pmbootstrap.sh
+3
-3
3 additions, 3 deletions
install_pmbootstrap.sh
with
6 additions
and
6 deletions
README.md
+
1
−
1
View file @
2a85b31a
...
...
@@ -6,4 +6,4 @@ Common scripts for continuous integration in postmarketOS projects.
Make sure that the "Allow commits from members who can merge to the target
branch" checkbox is ticked.
(
[
usage example
](
https://gitlab.com/postmarketOS/postmarketos-android-recovery-installer/-/merge_requests/3
)
)
\ No newline at end of file
(
[
usage example
](
https://gitlab.postmarketos.org/postmarketOS/postmarketos-android-recovery-installer/-/merge_requests/3
)
)
\ No newline at end of file
This diff is collapsed.
Click to expand it.
check_mr_settings.py
+
2
−
2
View file @
2a85b31a
...
...
@@ -32,13 +32,13 @@ def get_url_api():
project_path
=
urllib
.
parse
.
quote_plus
(
project_path
)
mr_id
=
os
.
environ
[
"
CI_MERGE_REQUEST_IID
"
]
url
=
"
https://gitlab.
com
/api/v4/projects/{}/merge_requests/{}
"
url
=
"
https://gitlab.
postmarketos.org
/api/v4/projects/{}/merge_requests/{}
"
return
url
.
format
(
project_path
,
mr_id
)
def
get_url_mr_edit
():
"""
:returns: the link where the user can edit their own MR
"""
url
=
"
https://gitlab.
com
/{}/-/merge_requests/{}/edit
"
url
=
"
https://gitlab.
postmarketos.org
/{}/-/merge_requests/{}/edit
"
return
url
.
format
(
os
.
environ
[
"
CI_MERGE_REQUEST_PROJECT_PATH
"
],
os
.
environ
[
"
CI_MERGE_REQUEST_IID
"
])
...
...
This diff is collapsed.
Click to expand it.
install_pmbootstrap.sh
+
3
−
3
View file @
2a85b31a
...
...
@@ -4,13 +4,13 @@
# usage: install_pmbootstrap.sh [ADDITIONAL_PACKAGE, ...]
:
"
${
PMBOOTSTRAP_TAG
:
=
"master"
}
"
:
"
${
PMBOOTSTRAP_URL
:
=
"https://gitlab.
com
/postmarketOS/pmbootstrap.git"
}
"
:
"
${
PMBOOTSTRAP_URL
:
=
"https://gitlab.
postmarketos.org
/postmarketOS/pmbootstrap.git"
}
"
# Add the "origin-original" remote to an existing pmaports.git clone, so
# pmbootstrap can use its channels.cfg.
add_remote_origin_original
()
{
# Skip if existing (happens in single runner setup)
remote_url
=
"https://gitlab.
com
/postmarketOS/pmaports.git"
remote_url
=
"https://gitlab.
postmarketos.org
/postmarketOS/pmaports.git"
remote_url_existing
=
"
$(
git
-C
"
$pmaports
"
\
remote get-url origin-original 2>/dev/null
\
||
true
)
"
...
...
@@ -28,7 +28,7 @@ add_remote_origin_original() {
# Add the remote, display the output only on error
if
!
git
-C
"
$pmaports
"
\
remote add
-f
origin-original
\
"https://gitlab.
com
/postmarketOS/pmaports.git"
\
"https://gitlab.
postmarketos.org
/postmarketOS/pmaports.git"
\
>
/tmp/git_remote_add 2>&1
;
then
echo
"ERROR: failed to add original remote with git!"
echo
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment