Skip to content

Commit 6e222cf

Browse files
atextoratextor
authored
Merge pull request #327 from bci-oss/fix-pipelines
Fix build pipelines
2 parents 4f2b73a + c104c96 commit 6e222cf

File tree

4 files changed

+31
-22
lines changed

4 files changed

+31
-22
lines changed

‎.github/workflows/pull-request-check.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
# This seems to be caused by running out of memory; increasing page file
3939
# size suggested here:
4040
# https://github.com/actions/virtual-environments/issues/3420#issuecomment-861342418
41-
uses: al-cheb/configure-pagefile-action@v1.2
41+
uses: al-cheb/configure-pagefile-action@v1.3
4242
with:
4343
minimum-size: 16GB
4444
maximum-size: 16GB
@@ -72,7 +72,6 @@ jobs:
7272
if: matrix.os == 'windows-latest'
7373
uses: actions/upload-artifact@v3
7474
with:
75-
name: bamm-cli-binary-${{ matrix.os }}
7675
name: samm-cli-binary-${{ matrix.os }}
7776
path: |
7877
tools/samm-cli/target/samm.exe

‎.github/workflows/release-workflow.yml‎

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,18 @@ jobs:
5151
- name: Checkout
5252
uses: actions/checkout@v3
5353

54+
# Even though the build itself is done using the GraalVM JDK
55+
# (see below), we use the setup-java action to have GPG configured
56+
# so that it can be used from the maven-gpg-plugin.
57+
- name: Configure GPG
58+
uses: actions/setup-java@v3
59+
with:
60+
distribution: 'temurin'
61+
java-version: '17'
62+
gpg-private-key: ${{ secrets.PGP_KEY }}
63+
gpg-passphrase: PGP_KEY_PASSWORD
64+
overwrite-settings: false
65+
5466
- name: Setup JDK
5567
uses: graalvm/setup-graalvm@v1
5668
with:
@@ -94,6 +106,8 @@ jobs:
94106
cd tools/samm-cli/target
95107
chmod a+x samm
96108
tar cfvz samm-cli-linux.tar.gz samm
109+
env:
110+
PGP_KEY_PASSWORD: ${{ secrets.PGP_KEY_PASSWORD }}
97111

98112
- name: Upload staging directory and Linux binary
99113
uses: actions/upload-artifact@v3
@@ -136,7 +150,7 @@ jobs:
136150
# This seems to be caused by running out of memory; increasing page file
137151
# size suggested here:
138152
# https://github.com/actions/virtual-environments/issues/3420#issuecomment-861342418
139-
uses: al-cheb/configure-pagefile-action@v1.2
153+
uses: al-cheb/configure-pagefile-action@v1.3
140154
with:
141155
minimum-size: 16GB
142156
maximum-size: 16GB
@@ -184,8 +198,6 @@ jobs:
184198
server-id: ossrh
185199
server-username: OSSRH_USERNAME
186200
server-password: OSSRH_TOKEN
187-
gpg-private-key: ${{ secrets.PGP_KEY }}
188-
gpg-passphrase: PGP_KEY_PASSWORD
189201
overwrite-settings: false
190202

191203
- name: Fetch Linux Artifacts
@@ -209,35 +221,33 @@ jobs:
209221
run: |
210222
mvn nexus-staging:deploy-staged-repository -DrepositoryDirectory=nexus-staging -Prelease-build
211223
env:
224+
OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
225+
OSSRH_TOKEN: ${{ secrets.OSSRH_TOKEN }}
212226
# Workaround for https://issues.sonatype.org/browse/OSSRH-66257
213227
# as described in https://stackoverflow.com/a/70157413
214228
MAVEN_OPTS: --add-opens=java.base/java.util=ALL-UNNAMED --add-opens=java.base/java.lang.reflect=ALL-UNNAMED --add-opens=java.base/java.text=ALL-UNNAMED --add-opens=java.desktop/java.awt.font=ALL-UNNAMED
215229

216-
- name: Create release commit
230+
- name: Set versions
217231
continue-on-error: true
218232
run: |
219-
git config user.name github-actions
220-
git config user.email [email protected]
221-
222233
release_version=${{ github.event.inputs.release_version }}
223234
release_branch_name=${release_version%.*}.x
224235
echo "release_branch_name=$release_branch_name" >> $GITHUB_ENV
225236
226-
git fetch
227-
git checkout -b $release_branch_name --track origin/$release_branch_name || true
228-
git checkout -b $release_branch_name
229-
230237
# Set version in pom.xml files
231238
mvn clean install -DskipTests -Dmaven.javadoc.skip=true
232239
mvn versions:set -DnewVersion=${{ github.event.inputs.release_version }}
233240
mvn versions:commit
234241
# Set version in Antora module
235242
yq eval -i '.version = "${{ github.event.inputs.release_version }}"' documentation/developer-guide/antora.yml
236-
# Push changes
237-
git add .
238-
if git commit -m "Add version ${{ github.event.inputs.release_version}}"; then
239-
git push origin ${{ env.release_branch_name }}
240-
fi
243+
244+
- name: Commit version changes and push to upstream repository
245+
uses: stefanzweifel/git-auto-commit-action@v4
246+
with:
247+
branch: ${{ env.release_branch_name }}
248+
commit_user_name: github-actions
249+
commit_user_email: [email protected]
250+
commit_author: Author <[email protected]>
241251

242252
# Full release: Github
243253
- name: "Create Github release (full)"

‎core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/diagram/Enumeration2BoxModelTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public void testSeeAttributeIsPresentExpectSuccess( final KnownVersion metaModel
6161
@ParameterizedTest
6262
@MethodSource( value = "allVersions" )
6363
public void testSeeAttributesArePresentExpectSuccess( final KnownVersion metaModelVersion ) {
64-
final String characteristicIdentifier = metaModelVersion.isNewerThan( KnownVersion.SAMM_1_0_0 ) ? "Enumeration14c1cbd" : "TestEnumeration";
64+
final String characteristicIdentifier = metaModelVersion.isNewerThan( KnownVersion.SAMM_1_0_0 ) ? "Enumeration46dba23" : "TestEnumeration";
6565
final String boxSelectorStatement = getBoxSelectorStatement( characteristicIdentifier );
6666
final String entriesSelectorStatement = getEntriesSelectorStatement( characteristicIdentifier );
6767
final TestContext context = new TestContext( TestAspect.ASPECT_WITH_ENUMERATION_WITH_MULTIPLE_SEE_ATTRIBUTES,

‎core/esmf-aspect-model-document-generators/src/test/java/org/eclipse/esmf/aspectmodel/generator/diagram/RangeConstraint2BoxModelTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class RangeConstraint2BoxModelTest extends AbstractConstraint2BoxModelTes
2424
@ParameterizedTest
2525
@MethodSource( value = "allVersions" )
2626
public void testBoundDefinitionAttributeIsPresentExpectSuccess( final KnownVersion metaModelVersion ) {
27-
final String constraintIdentifier = "RangeConstraint3509925";
27+
final String constraintIdentifier = "RangeConstraint4d81370";
2828
final TestContext context = new TestContext( TestAspect.ASPECT_WITH_RANGE_CONSTRAINT_WITH_BOUND_DEFINITION_ATTRIBUTES, metaModelVersion );
2929
context.executeAttributeIsPresentTest(
3030
sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ),
@@ -43,7 +43,7 @@ sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifie
4343
@MethodSource( value = "allVersions" )
4444
public void testRangeConstraintWithOnlyLowerBoundDefinitionAndBothValuesExpectSuccess(
4545
final KnownVersion metaModelVersion ) {
46-
final String constraintIdentifier = "RangeConstraint921729e";
46+
final String constraintIdentifier = "RangeConstraintf81d66a";
4747
final TestContext context = new TestContext( TestAspect.ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_LOWER_BOUND_DEFINITION_AND_BOTH_VALUES, metaModelVersion );
4848
context.executeAttributeIsPresentTest( sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ),
4949
entriesSelectorStatement( metaModelVersion, constraintIdentifier ), totalNumberOfExpectedEntriesPerMetaModelVersion.get( metaModelVersion ),
@@ -58,7 +58,7 @@ sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifie
5858
@ParameterizedTest
5959
@MethodSource( value = "allVersions" )
6060
public void testRangeConstraintWithOnlyMinValue( final KnownVersion metaModelVersion ) {
61-
final String constraintIdentifier = "RangeConstraintd9f2996";
61+
final String constraintIdentifier = "RangeConstraint45aa6b0";
6262
final TestContext context = new TestContext( TestAspect.ASPECT_WITH_RANGE_CONSTRAINT_WITH_ONLY_MIN_VALUE, metaModelVersion );
6363
context.executeAttributeIsPresentTest( sparqlQueryFileName, boxSelectorStatement( metaModelVersion, constraintIdentifier ),
6464
entriesSelectorStatement( metaModelVersion, constraintIdentifier ), totalNumberOfExpectedEntriesPerMetaModelVersion.get( metaModelVersion ),

0 commit comments

Comments
 (0)