Skip to content

Commit ec7b275

Browse files
remove go_modules osc source service and update makefile
1 parent 805cd59 commit ec7b275

File tree

2 files changed

+7
-6
lines changed

2 files changed

+7
-6
lines changed

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ build/obs/prometheus-ha_cluster_exporter:
100100
sed -i 's~%%VERSION%%~$(VERSION)~' $@/_service
101101
sed -i 's~%%REVISION%%~$(REVISION)~' $@/_service
102102
sed -i 's~%%REPOSITORY%%~$(REPOSITORY)~' $@/_service
103-
cd $@; osc service runall
103+
go mod vendor
104+
tar --sort=name --mtime='UTC 1970-01-01' -c vendor | gzip -n > $@/vendor.tar.gz
105+
cd $@; osc service manualrun
104106

105107
exporter-obs-changelog: exporter-obs-workdir
106108
.ci/gh_release_to_obs_changeset.py $(REPOSITORY) -a $(AUTHOR) -t $(REVISION) -f build/obs/prometheus-ha_cluster_exporter/prometheus-ha_cluster_exporter.changes
@@ -118,7 +120,7 @@ build/obs/grafana-ha-cluster-dashboards:
118120
# we interpolate environment variables in OBS _service file so that we control what is downloaded by the tar_scm source service
119121
sed -i 's~%%REVISION%%~$(REVISION)~' $@/_service
120122
sed -i 's~%%REPOSITORY%%~$(REPOSITORY)~' $@/_service
121-
cd $@; osc service runall
123+
cd $@; osc service manualrun
122124

123125
dashboards-obs-commit: dashboards-obs-workdir
124126
cd build/obs/grafana-ha-cluster-dashboards; osc addremove
Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<services>
2-
<service name="tar_scm" mode="disabled">
2+
<service name="tar_scm" mode="manual">
33
<param name="url">https://github.com/%%REPOSITORY%%.git</param>
44
<param name="scm">git</param>
55
<param name="revision">%%REVISION%%</param>
@@ -10,12 +10,11 @@
1010
<param name="version">%%VERSION%%</param>
1111
<param name="filename">prometheus-ha_cluster_exporter</param>
1212
</service>
13-
<service name="set_version" mode="disabled">
13+
<service name="set_version" mode="manual">
1414
<param name="file">prometheus-ha_cluster_exporter.spec</param>
1515
</service>
16-
<service name="recompress" mode="disabled">
16+
<service name="recompress" mode="manual">
1717
<param name="file">*.tar</param>
1818
<param name="compression">gz</param>
1919
</service>
20-
<service name="go_modules" mode="disabled" />
2120
</services>

0 commit comments

Comments
 (0)