From 79e0471abab31fe29404bcd1edc4f5ce8bd0428a Mon Sep 17 00:00:00 2001 From: Solomon Jacobs Date: Mon, 6 Nov 2023 16:03:28 +0100 Subject: [PATCH 1/2] Mirror workflow from `robocorp/rcc` Better to stay close to their implementation. --- .github/workflows/rcc.yaml | 40 +++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/.github/workflows/rcc.yaml b/.github/workflows/rcc.yaml index 6c547bb3..f26d452c 100644 --- a/.github/workflows/rcc.yaml +++ b/.github/workflows/rcc.yaml @@ -15,30 +15,30 @@ jobs: runs-on: ubuntu-latest steps: - - name: Checkout repository + - name: "Checkout repository" uses: actions/checkout@v4 with: submodules: true - - name: Setup Rake - run: | - sudo apt-get install rubygems - sudo gem install rake - - - name: Setup Go - run: | - wget https://go.dev/dl/go1.21.0.linux-amd64.tar.gz - # rcc expects $HOME/go/bin to be present (hard-coded) - tar -C $HOME -xzf go1.21.0.linux-amd64.tar.gz - echo "PATH=$PATH:$HOME/go/bin" >> $GITHUB_ENV - - - name: Build RCC - run: rake -C rcc build - - - name: Test RCC - run: rake -C rcc test - - - name: Upload RCC binaries + - name: "Setup Go" + uses: actions/setup-go@v3 + with: + go-version: '1.20.x' + + - name: "Setup Rake" + uses: ruby/setup-ruby@v1 + with: + ruby-version: '2.7' + + - name: "Build RCC" + working-directory: rcc + run: rake build + + - name: "Test RCC" + working-directory: rcc + run: rake test + + - name: "Upload RCC binaries" uses: actions/upload-artifact@v3 with: name: rcc From 67ac96d0a8c74650e9ff6d8b7229b847cd08d438 Mon Sep 17 00:00:00 2001 From: Solomon Jacobs Date: Mon, 6 Nov 2023 16:06:11 +0100 Subject: [PATCH 2/2] Move versioning of RCC into workflow file In order to turn Robotmk into an OMD package, we need to have a single reference, which allows create a reproducible build. To accomplish this, the workflow files should make our requirements explicitly. A submodule is explicit enough, but it differs from the way we pin other requirements. CMK-14985 --- .github/workflows/rcc.yaml | 9 ++++----- rcc | 1 - 2 files changed, 4 insertions(+), 6 deletions(-) delete mode 160000 rcc diff --git a/.github/workflows/rcc.yaml b/.github/workflows/rcc.yaml index f26d452c..1857fe67 100644 --- a/.github/workflows/rcc.yaml +++ b/.github/workflows/rcc.yaml @@ -18,7 +18,8 @@ jobs: - name: "Checkout repository" uses: actions/checkout@v4 with: - submodules: true + repository: robocorp/rcc + ref: v14.15.4 - name: "Setup Go" uses: actions/setup-go@v3 @@ -31,15 +32,13 @@ jobs: ruby-version: '2.7' - name: "Build RCC" - working-directory: rcc run: rake build - name: "Test RCC" - working-directory: rcc run: rake test - name: "Upload RCC binaries" uses: actions/upload-artifact@v3 with: - name: rcc - path: rcc/build + path: build + if-no-files-found: error diff --git a/rcc b/rcc deleted file mode 160000 index c74154fa..00000000 --- a/rcc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c74154fa919f620176adbf5a2804a8e960df5a29