Remove glow-preview workarounds from workflow files

wildfly · Apr 16, 2024 · 80b4e9a · 80b4e9a
1 parent 484f280
commit 80b4e9a
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 12 deletions.
diff --git a/.github/workflows/project_ci.yml b/.github/workflows/project_ci.yml
@@ -44,16 +44,13 @@ jobs:
   WildFly-build:
     uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main
     with:
-      # There is no upstream glow-preview branch. The QS glow-preview branch targets WildFLy main
-      #wildfly-branch: ${{ github.base_ref }}
-      wildfly-branch: main
+      wildfly-branch: ${{ github.base_ref }}
       wildfly-repo: "wildfly/wildfly"
 
   Test-build-with-deps-matrix:
     name: BUILD WITH DEPS - JDK${{ matrix.jdk }} - ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     needs: WildFly-build
-    if:
     strategy:
       fail-fast: false
       matrix:

diff --git a/.github/workflows/quickstart_ci.yml b/.github/workflows/quickstart_ci.yml
@@ -171,9 +171,7 @@ jobs:
   WildFly-build:
     uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main
     with:
-      # There is no upstream glow-preview branch. The QS glow-preview branch targets WildFLy main
-      #wildfly-branch: ${{ github.base_ref }}
-      wildfly-branch: main
+      wildfly-branch: ${{ github.base_ref }}
       wildfly-repo: "wildfly/wildfly"
 
   Test-build-with-deps-matrix:

diff --git a/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml b/.github/workflows/quickstart_ejb-txn-remote-call_ci.yml
@@ -20,7 +20,7 @@ env:
   MATRIX_JDK: '"11", "17"'
   MATRIX_OS: '"ubuntu-latest"'
   SERVER_PROVISIONING_SERVER_HOST: 'http://localhost'
-  EXTRA_RUN_ARGS: '-Pprovisioned-server -DpostgresqlUsername="test" -DpostgresqlPassword="test"'
+  EXTRA_RUN_ARGS: '-DpostgresqlUsername="test" -DpostgresqlPassword="test"'
   WILDFLY_SNAPSHOT_EXTRA_PACKAGE_ARGUMENTS: '-Dwildfly-glow-galleon-feature-packs-url=https://raw.githubusercontent.com/wildfly/wildfly-galleon-feature-packs/main/'
 jobs:
   Matrix-Setup:
@@ -133,9 +133,7 @@ jobs:
   WildFly-build:
     uses: wildfly/wildfly/.github/workflows/shared-wildfly-build.yml@main
     with:
-      # There is no upstream glow-preview branch. The QS glow-preview branch targets WildFLy main
-      #wildfly-branch: ${{ github.base_ref }}
-      wildfly-branch: main
+      wildfly-branch: ${{ github.base_ref }}
       wildfly-repo: "wildfly/wildfly"
 
   Test-build-with-deps-matrix:

diff --git a/.github/workflows/reduce_readme.yml b/.github/workflows/reduce_readme.yml
@@ -3,7 +3,7 @@ name: WildFly Quickstarts Update 'README.adoc's
 on:
   push:
     branches:
-      - glow-preview
+      - main
 
 # Only run the latest job
 concurrency: