fontist 1.14.5 → 1.14.6

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: c68fb06c5de27009bdfe263acef48958d5ec89d8599ab410e11781b24f582070
4
- data.tar.gz: 11b4b0d923fd4cb2c80723fc6d222b3ee67bf83f496cda0ec1348382563b33ff
3
+ metadata.gz: a40e3086d77be088d3e5b9f0fcfbba28432ef3af11c07251c867017fc9b4e3e6
4
+ data.tar.gz: 4bce5f3bf2242a75825f76021064ea833723c133f0f6e8bf76129772d01304cf
5
5
  SHA512:
6
- metadata.gz: ba79faf4ab79d0f61b45139b2d2b377aac6c05568a776c8a9066ce22ce888ad3c5ccac29d4a7c70edfaee0a864563f2d0d09951ca888e05b2413975375c64893
7
- data.tar.gz: 47be34621947a7bb5a0cb0ffe2a60c997049887329aa1d2a86dc12443139034f9d1ec712531c01393f179ace16e083f1890e24eb549093c3bedd8e724ad3e4b0
6
+ metadata.gz: cb78481b1ad39f589e05542ef9b2245efd101568653e67b9f8ea9e319c0fc91d3c2610abc3be98becd011ddc5482a7151d25e66573f7ffbb1db724ef0dfec424
7
+ data.tar.gz: 0f698703d50d14838ea8442bd1224ead677132b79a43580c8327df09732926b545607ca21e3239d3092a5561787b32e721bad25f99a4e2073d46b36b054536b2
@@ -10,16 +10,22 @@ concurrency:
10
10
  cancel-in-progress: true
11
11
 
12
12
  jobs:
13
+ prepare:
14
+ uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
15
+
13
16
  test:
14
- name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
17
+ name: Test on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
15
18
  runs-on: ${{ matrix.os }}
16
- continue-on-error: ${{ matrix.experimental }}
19
+
20
+ needs: prepare
21
+ if: needs.prepare.outputs.push-for-tag != 'true'
22
+
23
+ continue-on-error: ${{ matrix.ruby.experimental }}
17
24
  strategy:
18
25
  fail-fast: false
19
- matrix:
20
- ruby: [ '2.7', '3.0', '3.1' ]
21
- os: [ ubuntu-latest, windows-latest, macos-latest ]
22
- experimental: [ true ]
26
+ max-parallel: 5
27
+ matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
28
+
23
29
  steps:
24
30
  - uses: actions/checkout@v3
25
31
  with:
@@ -29,21 +35,12 @@ jobs:
29
35
  with:
30
36
  path: "fontist"
31
37
 
32
- - run: 'echo ''gem "fontist", path: "./fontist"'' > Gemfile.devel'
33
-
34
- - if: matrix.ruby == '3.0'
35
- uses: ruby/setup-ruby@v1
36
- with:
37
- ruby-version: ${{ matrix.ruby }}
38
- bundler-cache: true
39
- rubygems: latest
40
-
41
- - if: matrix.ruby != '3.0'
42
- uses: ruby/setup-ruby@v1
38
+ - uses: ruby/setup-ruby@v1
43
39
  with:
44
- ruby-version: ${{ matrix.ruby }}
40
+ ruby-version: ${{ matrix.ruby.version }}
41
+ rubygems: ${{ matrix.ruby.rubygems }}
45
42
  bundler-cache: true
46
43
 
47
- - uses: metanorma/metanorma-build-scripts/inkscape-setup-action@main
44
+ - uses: metanorma/ci/inkscape-setup-action@main
48
45
 
49
46
  - run: bundle exec rake
@@ -11,29 +11,35 @@ concurrency:
11
11
  cancel-in-progress: true
12
12
 
13
13
  jobs:
14
+ prepare:
15
+ uses: metanorma/ci/.github/workflows/prepare-rake.yml@main
16
+
14
17
  test:
15
- name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
18
+ name: Test on Ruby ${{ matrix.ruby.version }} ${{ matrix.os }}
16
19
  runs-on: ${{ matrix.os }}
17
- continue-on-error: false
20
+
21
+ needs: prepare
22
+ if: needs.prepare.outputs.push-for-tag != 'true'
23
+
24
+ continue-on-error: ${{ matrix.ruby.experimental }}
18
25
  strategy:
19
26
  fail-fast: false
20
- matrix:
21
- ruby: [ '2.6', '2.7', '3.0', '3.1' ]
22
- os: [ ubuntu-18.04, ubuntu-latest, windows-latest, macos-latest ]
27
+ max-parallel: 5
28
+ matrix: ${{ fromJson(needs.prepare.outputs.matrix) }}
23
29
 
24
30
  steps:
25
31
  - uses: actions/checkout@v3
26
32
 
27
33
  - uses: ruby/setup-ruby@v1
28
34
  with:
29
- ruby-version: ${{ matrix.ruby }}
35
+ ruby-version: ${{ matrix.ruby.version }}
36
+ rubygems: ${{ matrix.ruby.rubygems }}
30
37
  bundler-cache: true
31
38
 
32
39
  - if: matrix.os == 'macos-latest'
33
- run: brew install lcdf-typetools
34
-
35
- - if: matrix.os == 'macos-latest'
36
- run: bundle exec rspec
40
+ run: |
41
+ brew install lcdf-typetools
42
+ bundle exec rspec
37
43
  env:
38
44
  TEST_ENV: CI
39
45
 
@@ -70,6 +76,12 @@ jobs:
70
76
  steps:
71
77
  - uses: actions/checkout@v3
72
78
 
73
- - uses: cadwallion/publish-rubygems-action@master
74
- env:
75
- RUBYGEMS_API_KEY: ${{secrets.FONTIST_CI_RUBYGEMS_API_KEY}}
79
+ - uses: ruby/setup-ruby@v1
80
+ with:
81
+ ruby-version: 3.1
82
+ bundler-cache: true
83
+
84
+ - uses: actions-mn/gem-release@main
85
+ with:
86
+ api-key: ${{ secrets.FONTIST_CI_RUBYGEMS_API_KEY }}
87
+ release-command: bundle exec rake release
data/lib/fontist/repo.rb CHANGED
@@ -60,7 +60,11 @@ module Fontist
60
60
  if Dir.exist?(path)
61
61
  Git.open(path).pull
62
62
  else
63
- Git.clone(url, path, depth: 1)
63
+ repo = Git.clone(url, path, depth: 1)
64
+ if repo.branches[:main].name != repo.current_branch
65
+ # https://github.com/ruby-git/ruby-git/issues/531
66
+ repo.checkout(:main).pull
67
+ end
64
68
  end
65
69
  end
66
70
 
@@ -1,3 +1,3 @@
1
1
  module Fontist
2
- VERSION = "1.14.5".freeze
2
+ VERSION = "1.14.6".freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fontist
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.14.5
4
+ version: 1.14.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2022-09-26 00:00:00.000000000 Z
11
+ date: 2023-02-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: down
@@ -383,7 +383,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
383
383
  - !ruby/object:Gem::Version
384
384
  version: '0'
385
385
  requirements: []
386
- rubygems_version: 3.3.7
386
+ rubygems_version: 3.3.26
387
387
  signing_key:
388
388
  specification_version: 4
389
389
  summary: Install openly-licensed fonts on Windows, Linux and Mac!