From d125e74115e288231e3e4bb5f4d89b97d26e58ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Ruiz?= Date: Fri, 22 Dec 2023 18:31:03 +0100 Subject: [PATCH] Final cleanup --- .github/workflows/build.yml | 11 +---------- .github/workflows/r_assemble.yml | 6 ------ .github/workflows/r_build.yml | 4 +--- .github/workflows/r_version.yml | 3 +-- 4 files changed, 3 insertions(+), 21 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index f03c6cbfaa2a5..4b286884541c7 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -19,22 +19,13 @@ on: # | https://docs.github.com/en/actions/using-workflows/reusing-workflows#limitations # * Using matrix in reusable workflows: # | https://docs.github.com/en/actions/using-workflows/reusing-workflows#using-a-matrix-strategy-with-a-reusable-workflow -# * Reading input from the called workflow +# * Reading input from the called workflow # | https://docs.github.com/en/enterprise-cloud@latest/actions/using-workflows/workflow-syntax-for-github-actions#onworkflow_callinputs -env: - ACT: # Used to run locally using https://github.com/nektos/act - # VERSION: # Stored in ${{ version.outputs.version }} - # rpm_x64: - # deb_x64: - # echo "{${{ matrix.distribution }}_${{ matrix.distribution }}}={value}" >> "$GITHUB_ENV" - jobs: version: uses: ./.github/workflows/r_version.yml - # idea: test if the the code and repo versions match (vars.VERSION), if not - # raise an error to cancel build build: needs: version strategy: diff --git a/.github/workflows/r_assemble.yml b/.github/workflows/r_assemble.yml index 8096d107fb607..62eb1cfb23811 100644 --- a/.github/workflows/r_assemble.yml +++ b/.github/workflows/r_assemble.yml @@ -26,7 +26,6 @@ on: jobs: r_assemble: - # runs-on: ${{ inputs.architecture }} runs-on: ubuntu-latest # Permissions to upload the package permissions: @@ -34,11 +33,6 @@ jobs: contents: read steps: - uses: actions/checkout@v4 - - name: Test - run: | - echo "${{ inputs.distribution }}_${{ inputs.architecture }}" - echo ${{ inputs.name }} - - name: Download artifact uses: actions/download-artifact@v4 with: diff --git a/.github/workflows/r_build.yml b/.github/workflows/r_build.yml index d7a6dc29b2cfb..3551bede541d9 100644 --- a/.github/workflows/r_build.yml +++ b/.github/workflows/r_build.yml @@ -19,12 +19,11 @@ on: type: string outputs: package: - description: "The package's name" + description: "The name of the generated package." value: ${{ jobs.r_build.outputs.package }} jobs: r_build: - # runs-on: ${{ inputs.architecture }} runs-on: ubuntu-latest # Permissions to upload the package permissions: @@ -38,7 +37,6 @@ jobs: with: distribution: temurin java-version: 11 - cache: 'gradle' - name: Setup Gradle uses: gradle/gradle-build-action@v2.9.0 diff --git a/.github/workflows/r_version.yml b/.github/workflows/r_version.yml index b1de3e2ec29b7..d3c01135a6c35 100644 --- a/.github/workflows/r_version.yml +++ b/.github/workflows/r_version.yml @@ -1,4 +1,4 @@ -name: Build (reusable) +name: Version (reusable) # This workflow runs when any of the following occur: # - Run from another workflow @@ -16,7 +16,6 @@ jobs: version: ${{ steps.get_version.outputs.version }} steps: - uses: actions/checkout@v4 - - name: Read 'VERSION' id: get_version run: |