From 69909a332cc4c9a0521c33f9e3bc2478239d085c Mon Sep 17 00:00:00 2001 From: Naoto Ono Date: Mon, 19 Feb 2024 18:51:49 +0900 Subject: [PATCH] Revert "Add launchable integration" This reverts commit 62ea9d1b08ea5c2ed4a681088376fba5e4a85954. --- .github/workflows/protocol.yml | 37 +------------------------------ .github/workflows/ruby-macos.yaml | 37 +------------------------------ .github/workflows/ruby.yml | 37 +------------------------------ .github/workflows/test_test.yml | 37 +------------------------------ Gemfile | 1 - test/support/test_case.rb | 2 -- 6 files changed, 4 insertions(+), 147 deletions(-) diff --git a/.github/workflows/protocol.yml b/.github/workflows/protocol.yml index 984819287..755557039 100644 --- a/.github/workflows/protocol.yml +++ b/.github/workflows/protocol.yml @@ -6,17 +6,6 @@ on: pull_request: branches: [ master ] -env: - # GITHUB_PULL_REQUEST_URL are used for commenting test reports in Launchable Github App. - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/link.py#L42 - GITHUB_PULL_REQUEST_URL: ${{ github.event.pull_request.html_url }} - # The following envs are necessary in Launchable tokenless authentication. - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L20 - LAUNCHABLE_ORGANIZATION: "ruby" - LAUNCHABLE_WORKSPACE: "debug" - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L71 - GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} - jobs: test: @@ -29,27 +18,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - # Set fetch-depth: 0 so that Launchable can receive commits information. - fetch-depth: 0 - # Launchable requires Python and Java - # https://www.launchableinc.com/docs/resources/cli-reference/ - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Set up JDK 1.8 - uses: actions/setup-java@v3 - with: - distribution: 'adopt' - java-version: '8' - # Setup Launchable - - name: Launchable - install command - run: pip install launchable - - name: Launchable - verify - run: launchable verify - - name: Launchable - record build - run: launchable record build --name ${GITHUB_PR_HEAD_SHA} - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -59,7 +27,4 @@ jobs: run: | bundle exec rake clobber bundle exec rake compile - TESTOPTS="--runner=junitxml --junitxml-output-file=protocol.xml" bundle exec rake test_protocol - - name: Launchable - record tests - run: launchable record tests --flavor test=protocol --flavor os=ubuntu-latest --flavor ruby=${{ matrix.ruby-version }} file protocol.xml - if: always() + bundle exec rake test_protocol diff --git a/.github/workflows/ruby-macos.yaml b/.github/workflows/ruby-macos.yaml index 97a072686..4b04e8647 100644 --- a/.github/workflows/ruby-macos.yaml +++ b/.github/workflows/ruby-macos.yaml @@ -6,17 +6,6 @@ on: pull_request: branches: [ master ] -env: - # GITHUB_PULL_REQUEST_URL are used for commenting test reports in Launchable Github App. - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/link.py#L42 - GITHUB_PULL_REQUEST_URL: ${{ github.event.pull_request.html_url }} - # The following envs are necessary in Launchable tokenless authentication. - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L20 - LAUNCHABLE_ORGANIZATION: "ruby" - LAUNCHABLE_WORKSPACE: "debug" - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L71 - GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} - jobs: test: @@ -29,27 +18,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - # Set fetch-depth: 0 so that Launchable can receive commits information. - fetch-depth: 0 - # Launchable requires Python and Java - # https://www.launchableinc.com/docs/resources/cli-reference/ - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Set up JDK 1.8 - uses: actions/setup-java@v3 - with: - distribution: 'adopt' - java-version: '8' - # Setup Launchable - - name: Launchable - install command - run: pip install launchable - - name: Launchable - verify - run: launchable verify - - name: Launchable - record build - run: launchable record build --name ${GITHUB_PR_HEAD_SHA} - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -59,7 +27,4 @@ jobs: run: | bundle exec rake clobber bundle exec rake compile - TESTOPTS="--runner=junitxml --junitxml-output-file=ruby-macos.xml" bundle exec rake test_console - - name: launchable record tests - run: launchable record tests --flavor test=console --flavor os=macos-latest --flavor ruby=${{ matrix.ruby-version }} file ruby-macos.xml - if: always() + bundle exec rake test_console diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml index c5052e5fd..dd76ced54 100644 --- a/.github/workflows/ruby.yml +++ b/.github/workflows/ruby.yml @@ -6,17 +6,6 @@ on: pull_request: branches: [ master ] -env: - # GITHUB_PULL_REQUEST_URL are used for commenting test reports in Launchable Github App. - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/link.py#L42 - GITHUB_PULL_REQUEST_URL: ${{ github.event.pull_request.html_url }} - # The following envs are necessary in Launchable tokenless authentication. - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L20 - LAUNCHABLE_ORGANIZATION: "ruby" - LAUNCHABLE_WORKSPACE: "debug" - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L71 - GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} - jobs: test: @@ -29,27 +18,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - # Set fetch-depth: 0 so that Launchable can receive commits information. - fetch-depth: 0 - # Launchable requires Python and Java - # https://www.launchableinc.com/docs/resources/cli-reference/ - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Set up JDK 1.8 - uses: actions/setup-java@v3 - with: - distribution: 'adopt' - java-version: '8' - # Setup Launchable - - name: Launchable - install command - run: pip install launchable - - name: Launchable - verify - run: launchable verify - - name: Launchable - record build - run: launchable record build --name ${GITHUB_PR_HEAD_SHA} - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -59,7 +27,4 @@ jobs: run: | bundle exec rake clobber bundle exec rake compile - TESTOPTS="--runner=junitxml --junitxml-output-file=ruby.xml" bundle exec rake test_console - - name: launchable record tests - run: launchable record tests --flavor test=console --flavor os=ubuntu-latest --flavor ruby=${{ matrix.ruby-version }} file ruby.xml - if: always() + bundle exec rake test_console diff --git a/.github/workflows/test_test.yml b/.github/workflows/test_test.yml index 0a45b7c34..3123697fe 100644 --- a/.github/workflows/test_test.yml +++ b/.github/workflows/test_test.yml @@ -6,17 +6,6 @@ on: pull_request: branches: [ master ] -env: - # GITHUB_PULL_REQUEST_URL are used for commenting test reports in Launchable Github App. - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/link.py#L42 - GITHUB_PULL_REQUEST_URL: ${{ github.event.pull_request.html_url }} - # The following envs are necessary in Launchable tokenless authentication. - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L20 - LAUNCHABLE_ORGANIZATION: "ruby" - LAUNCHABLE_WORKSPACE: "debug" - # https://github.com/launchableinc/cli/blob/v1.80.1/launchable/utils/authentication.py#L71 - GITHUB_PR_HEAD_SHA: ${{ github.event.pull_request.head.sha }} - jobs: test: @@ -29,27 +18,6 @@ jobs: steps: - uses: actions/checkout@v4 - with: - # Set fetch-depth: 0 so that Launchable can receive commits information. - fetch-depth: 0 - # Launchable requires Python and Java - # https://www.launchableinc.com/docs/resources/cli-reference/ - - uses: actions/setup-python@v4 - with: - python-version: "3.10" - - name: Set up JDK 1.8 - uses: actions/setup-java@v3 - with: - distribution: 'adopt' - java-version: '8' - # Setup Launchable - - name: Launchable - install command - run: pip install launchable - - name: Launchable - verify - run: launchable verify - - name: Launchable - record build - run: launchable record build --name ${GITHUB_PR_HEAD_SHA} - - name: Set up Ruby uses: ruby/setup-ruby@v1 with: @@ -59,7 +27,4 @@ jobs: run: | bundle exec rake clobber bundle exec rake compile - TESTOPTS="--runner=junitxml --junitxml-output-file=test_test.xml" bundle exec rake test_test - - name: launchable record tests - run: launchable record tests --flavor test=test-framework --flavor os=ubuntu-latest --flavor ruby=${{ matrix.ruby-version }} file test_test.xml - if: always() + bundle exec rake test_test diff --git a/Gemfile b/Gemfile index 50630d1e8..c59ccbe1a 100644 --- a/Gemfile +++ b/Gemfile @@ -7,4 +7,3 @@ gem "rake-compiler" gem "test-unit", "~> 3.0" gem "test-unit-rr" gem "json-schema" -gem "test-unit-runner-junitxml" diff --git a/test/support/test_case.rb b/test/support/test_case.rb index 5725e8df2..fae5b9f58 100644 --- a/test/support/test_case.rb +++ b/test/support/test_case.rb @@ -7,8 +7,6 @@ require 'timeout' require 'json' require 'rbconfig' -# "test/unit/runner/junitxml" is used for reporting test result in JUnit XML format. -require "test/unit/runner/junitxml" require_relative '../../lib/debug/client' require_relative 'assertions'