Skip to content

Commit 97007e3

Browse files
bundlerbotdeivid-rodriguez
authored andcommitted
Merge #3024
3024: Remove unnecessary CI step r=bronzdoc a=deivid-rodriguez # Description: Currently, the `apt install` step in our CI causes some stability some times. However, only a single test relies on the `zip` package being present. That test was added on #2787 and essentially checked that the `Manifest.txt` file was in sync. However, in #2953 a more robust check for that was added, so I think we can remove the original test and thus remove the `apt install` step too. # Tasks: - [x] Describe the problem / feature - [ ] Write tests - [x] Write code to solve the problem - [ ] Get code review from coworkers / friends I will abide by the [code of conduct](https://github.com/rubygems/rubygems/blob/master/CODE_OF_CONDUCT.md). Co-authored-by: David Rodríguez <[email protected]>
1 parent 5b60868 commit 97007e3

File tree

4 files changed

+2
-47
lines changed

4 files changed

+2
-47
lines changed

.github/workflows/ruby-master.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jobs:
1818
steps:
1919
- name: Setup Requirements
2020
run: |
21-
apt update -qy
22-
apt install zip -qy
2321
gem install rake --no-document
2422
- uses: actions/checkout@v1
2523
- run: git submodule update -i

.github/workflows/ubuntu-rvm.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
- name: Set up Ruby
2929
run: |
3030
source $HOME/.rvm/scripts/rvm
31-
rvm install ${{ matrix.ruby }} --binary
31+
rvm install ${{ matrix.ruby }} --binary --autolibs=disable
3232
rvm --default use ${{ matrix.ruby }}
3333
- name: Test rubygems
3434
run: |
Lines changed: 0 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,9 @@
11
# frozen_string_literal: true
22

3-
require "rubygems/test_case"
43
require "open3"
54

65
class TestProjectSanity < Minitest::Test
76

8-
def test_rake_package_builds_ok
9-
skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__))
10-
11-
with_empty_pkg_folder do
12-
output, status = Open3.capture2e("rake package")
13-
14-
assert_equal true, status.success?, <<~MSG.chomp
15-
Expected `rake package` to work, but got errors:
16-
17-
```
18-
#{output}
19-
```
20-
21-
If you have added or removed files, make sure you run `rake update_manifest` to update the `Manifest.txt` accordingly
22-
MSG
23-
end
24-
end
25-
267
def test_manifest_is_up_to_date
278
skip unless File.exist?(File.expand_path("../../../Rakefile", __FILE__))
289

@@ -31,28 +12,4 @@ def test_manifest_is_up_to_date
3112
assert status.success?, "Expected Manifest.txt to be up to date, but it's not. Run `rake update_manifest` to sync it."
3213
end
3314

34-
private
35-
36-
def with_empty_pkg_folder
37-
if File.exist?("pkg")
38-
FileUtils.cp_r("pkg", "tmp")
39-
40-
begin
41-
FileUtils.rm_rf("pkg")
42-
yield
43-
ensure
44-
FileUtils.rm_rf("pkg")
45-
FileUtils.cp_r("tmp/pkg", ".")
46-
end
47-
else
48-
Dir.mkdir("pkg")
49-
50-
begin
51-
yield
52-
ensure
53-
FileUtils.rm_rf("pkg")
54-
end
55-
end
56-
end
57-
5815
end

util/ci.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ case $1 in
3030
fi
3131

3232
gem install rake -v "~>12.0"
33-
exec bin/rake spec:travis:deps
33+
exec bin/rake spec:deps
3434
fi
3535

3636
;;

0 commit comments

Comments
 (0)