remove self-hosted runner (#3227)

pgjdbc · Apr 22, 2024 · f22fbc3 · f22fbc3
1 parent 4e710d5
commit f22fbc3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -81,7 +81,7 @@ jobs:
           S3_BUILD_CACHE_ACCESS_KEY_ID: ${{ secrets.S3_BUILD_CACHE_ACCESS_KEY_ID }}
           S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
         with:
-          read-only: ${{ matrix.os == 'self-hosted' }}
+          read-only: false
           job-id: checker-jdk17
           arguments: --scan --no-parallel --no-daemon -PenableCheckerframework classes
 
@@ -216,7 +216,7 @@ jobs:
         S3_BUILD_CACHE_SECRET_KEY: ${{ secrets.S3_BUILD_CACHE_SECRET_KEY }}
         _JAVA_OPTIONS: ${{ matrix.extraJvmArgs }}
       with:
-        read-only: ${{ matrix.os == 'self-hosted' }}
+        read-only: false
         job-id: jdk${{ matrix.java_version }}
         arguments: --scan --no-parallel --no-daemon jandex test ${{ matrix.extraGradleArgs }}
         properties: |
@@ -242,7 +242,7 @@ jobs:
       if: ${{ matrix.deploy_to_maven_local }}
       name: Deploy pgjdbc to mavenLocal
       with:
-        read-only: ${{ matrix.os == 'self-hosted' }}
+        read-only: false
         job-id: jdk${{ matrix.java_version }}
         arguments: publishToMavenLocal -Ppgjdbc.version=1.0.0-dev-master -PskipJavadoc
     - name: Attach heap dump if any

diff --git a/.github/workflows/matrix.js b/.github/workflows/matrix.js
@@ -99,7 +99,6 @@ matrix.addAxis({
     // We use docker-compose for launching PostgreSQL
     // 'windows-latest',
     // 'macos-latest',
-    ...(process.env.GITHUB_REPOSITORY === 'pgjdbc/pgjdbc' ? ['self-hosted'] : [])
   ]
 });
 
@@ -222,11 +221,7 @@ matrix.imply({java_distribution: {value: 'microsoft'}}, {java_version: v => v >=
 matrix.imply({java_distribution: {value: 'oracle'}}, {java_version: v => v === eaJava || v >= 17});
 // TODO: Semeru does not ship Java 21 builds yet
 matrix.exclude({java_distribution: {value: 'semeru'}, java_version: '21'})
-matrix.exclude({gss: {value: 'yes'}, os: ['windows-latest', 'macos-latest', 'self-hosted']})
-if (process.env.GITHUB_REPOSITORY === 'pgjdbc/pgjdbc') {
-    // PG images below 9.3 are x86_64 only
-    matrix.exclude({os: 'self-hosted', pg_version: lessThan('9.3')});
-}
+matrix.exclude({gss: {value: 'yes'}, os: ['windows-latest', 'macos-latest']})
 
 // The most rare features should be generated the first
 // For instance, we have a lot of PostgreSQL versions, so we generate the minimal the first
@@ -251,9 +246,6 @@ matrix.generateRow({ssl: {value: 'yes'}});
 // Ensure at least one Windows and at least one Linux job is present (macOS is almost the same as Linux)
 // matrix.generateRow({os: 'windows-latest'});
 matrix.generateRow({os: 'ubuntu-latest'});
-if (process.env.GITHUB_REPOSITORY === 'pgjdbc/pgjdbc') {
-  matrix.generateRow({os: 'self-hosted'});
-}
 // Ensure we test all query_mode values
 for (let query_mode of matrix.axisByName.query_mode.values) {
   matrix.generateRow({query_mode: query_mode});