diff --git a/.github/actions/setup_project_workspace/action.yml b/.github/actions/setup_project_workspace/action.yml index 73faeade..baedbb77 100644 --- a/.github/actions/setup_project_workspace/action.yml +++ b/.github/actions/setup_project_workspace/action.yml @@ -8,6 +8,21 @@ inputs: maven_password: required: false description: The password to use for the Maven server + spigot_buildtools_sftp_host: + required: false + description: The SFTP host to use for caching the Spigot BuildTools + spigot_buildtools_sftp_port: + required: false + description: The SFTP port to use + spigot_buildtools_sftp_user: + required: false + description: The SFTP user to use + spigot_buildtools_sftp_private_key: + required: false + description: The SFTP private key to use + spigot_buildtools_sftp_host_key: + required: false + description: The SFTP host key to expect runs: using: composite @@ -27,6 +42,11 @@ runs: with: versions: 1.18.1, 1.18.2, 1.19, 1.19.2, 1.19.3, 1.19.4, 1.20.1, 1.20.2, 1.20.4 remapped: true + sftpCacheHost: ${{ inputs.spigot_buildtools_sftp_host }} + sftpCachePort: ${{ inputs.spigot_buildtools_sftp_port }} + sftpCacheUser: ${{ inputs.spigot_buildtools_sftp_user }} + sftpCachePrivateKey: ${{ inputs.spigot_buildtools_sftp_private_key }} + sftpCacheExpectedHostKey: ${{ inputs.spigot_buildtools_sftp_host_key }} - uses: actions/setup-java@v4 with: @@ -38,3 +58,8 @@ runs: with: versions: 1.20.6 remapped: true + sftpCacheHost: ${{ inputs.spigot_buildtools_sftp_host }} + sftpCachePort: ${{ inputs.spigot_buildtools_sftp_port }} + sftpCacheUser: ${{ inputs.spigot_buildtools_sftp_user }} + sftpCachePrivateKey: ${{ inputs.spigot_buildtools_sftp_private_key }} + sftpCacheExpectedHostKey: ${{ inputs.spigot_buildtools_sftp_host_key }} diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ddcc6b9c..16eaf467 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,6 +22,12 @@ jobs: - uses: actions/checkout@v4 - name: Prepare Workspace uses: ./.github/actions/setup_project_workspace + with: + spigot_buildtools_sftp_host: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_HOST }} + spigot_buildtools_sftp_port: ${{ vars.SPIGOT_BUILDTOOLS_SFTP_PORT }} + spigot_buildtools_sftp_user: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_USER }} + spigot_buildtools_sftp_private_key: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_PRIVATE_KEY }} + spigot_buildtools_sftp_host_key: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_HOST_KEY }} - name: Run tests run: mvn -B clean test @@ -38,6 +44,11 @@ jobs: with: maven_username: ${{ secrets.PLUGINS_MAVEN_REPO_USERNAME }} maven_password: ${{ secrets.PLUGINS_MAVEN_REPO_PASSWORD }} + spigot_buildtools_sftp_host: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_HOST }} + spigot_buildtools_sftp_port: ${{ vars.SPIGOT_BUILDTOOLS_SFTP_PORT }} + spigot_buildtools_sftp_user: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_USER }} + spigot_buildtools_sftp_private_key: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_PRIVATE_KEY }} + spigot_buildtools_sftp_host_key: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_HOST_KEY }} - name: Set project version uses: craftaro/GH-Commons/.github/actions/maven_set_project_version@master diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 0e608f7c..888bd1fb 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -28,6 +28,12 @@ jobs: - name: Prepare Workspace uses: ./.github/actions/setup_project_workspace + with: + spigot_buildtools_sftp_host: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_HOST }} + spigot_buildtools_sftp_port: ${{ vars.SPIGOT_BUILDTOOLS_SFTP_PORT }} + spigot_buildtools_sftp_user: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_USER }} + spigot_buildtools_sftp_private_key: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_PRIVATE_KEY }} + spigot_buildtools_sftp_host_key: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_HOST_KEY }} - name: Build with Maven run: mvn -B -DskipTests clean package diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index ec0584b8..e895c4b7 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -23,6 +23,12 @@ jobs: - name: Prepare Workspace uses: ./.github/actions/setup_project_workspace + with: + spigot_buildtools_sftp_host: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_HOST }} + spigot_buildtools_sftp_port: ${{ vars.SPIGOT_BUILDTOOLS_SFTP_PORT }} + spigot_buildtools_sftp_user: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_USER }} + spigot_buildtools_sftp_private_key: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_PRIVATE_KEY }} + spigot_buildtools_sftp_host_key: ${{ secrets.SPIGOT_BUILDTOOLS_SFTP_HOST_KEY }} - name: 'Cache: SonarCloud' uses: actions/cache@v4