Skip to content

Commit

Permalink
Attempt to fix the CI workflow
Browse files Browse the repository at this point in the history
  • Loading branch information
urbic committed Feb 25, 2025
1 parent a37f73f commit c739432
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: CI-1
name: CI
on:
push:
branches: [master]
Expand Down
16 changes: 5 additions & 11 deletions src/ant/obs.ant
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
<isset property="env.OBS_PASSWORD"/>
</condition>
<property name="osc.rc" location="${user.home}/.config/osc/oscrc"/>
<!--property name="osc.rc" location=".oscrc"/-->

<filterset id="obs.build.filterset">
<propertyset>
Expand All @@ -49,8 +48,7 @@ credentials_mgr_class=osc.credentials.ObfuscatedConfigFileCredentialsManager
pass=
]]></echo>
<exec executable="osc" if:true="${obs.password.set}">
<arg value="--config"/>
<arg value="${osc.rc}"/>
<arg value="--config=${osc.rc}"/>
<arg value="config"/>
<arg value="${obs.build.apiurl}"/>
<arg value="pass"/>
Expand All @@ -63,8 +61,7 @@ pass=
depends="osc.config"
>
<exec dir="${target}" executable="osc">
<arg value="--config"/>
<arg value="${osc.rc}"/>
<arg value="--config=${osc.rc}"/>
<arg value="checkout"/>
<arg value="${obs.build.project}"/>
<arg value="${obs.package.name}"/>
Expand Down Expand Up @@ -93,8 +90,7 @@ pass=
<filterset refid="obs.build.filterset"/>
</copy>
<exec executable="osc" dir="${target.obs}">
<arg value="--config"/>
<arg value="${osc.rc}"/>
<arg value="--config=${osc.rc}"/>
<arg value="addremove"/>
</exec>
</target>
Expand All @@ -104,8 +100,7 @@ pass=
depends="obs.copy.spec"
>
<exec executable="osc" dir="${target.obs}">
<arg value="--config"/>
<arg value="${osc.rc}"/>
<arg value="--config=${osc.rc}"/>
<arg value="build"/>
<arg value="--no-service"/>
<arg value="--no-verify"/>
Expand All @@ -123,8 +118,7 @@ pass=
depends="obs.copy.spec,osc.config"
>
<exec dir="${target.obs}" executable="osc">
<arg value="--config"/>
<arg value="${osc.rc}"/>
<arg value="--config=${osc.rc}"/>
<arg value="commit"/>
<arg value="-n"/>
</exec>
Expand Down

0 comments on commit c739432

Please sign in to comment.