History

Finish migration to 'main'

Sebastian Thiel committed 6 years ago

Commit 1d572ea1 parent da77cc84 files · +6 −12Browse files

Showing the changes to .github (2 of 4 files). Show all

Unified · Split

2 files
  1. .github/workflows/release.yml +1 −7
  2. .github/workflows/rust.yml +2 −2
.github/workflows/release.yml+1−7
@@ -15,7 +15,7 @@ on: · 14 unmodified lines
15 push:15 push:
16# # Enable when testing release infrastructure on a branch.16# # Enable when testing release infrastructure on a branch.
17# branches:17# branches:
18# - master18# - main
19 tags:19 tags:
20 - 'v[0-9]+.[0-9]+.[0-9]+'20 - 'v[0-9]+.[0-9]+.[0-9]+'
21jobs:21jobs:
@@ -119,9 +119,6 @@ jobs: · 97 unmodified lines
119 119
120 - name: Use Cross120 - name: Use Cross
121 run: |121 run: |
122 # FIXME: to work around bugs in latest cross release, install master.
123 # ME: Still needed? Issue seems closed
124 # See: https://github.com/rust-embedded/cross/issues/357
125 cargo install --git https://github.com/rust-embedded/cross122 cargo install --git https://github.com/rust-embedded/cross
126 echo "::set-env name=CARGO::cross"123 echo "::set-env name=CARGO::cross"
127 echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}"124 echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}"
@@ -237,9 +234,6 @@ jobs: · 109 unmodified lines
237 234
238 - name: Use Cross235 - name: Use Cross
239 run: |236 run: |
240 # FIXME: to work around bugs in latest cross release, install master.
241 # ME: Still needed? Issue seems closed
242 # See: https://github.com/rust-embedded/cross/issues/357
243 cargo install --git https://github.com/rust-embedded/cross237 cargo install --git https://github.com/rust-embedded/cross
244 echo "::set-env name=CARGO::cross"238 echo "::set-env name=CARGO::cross"
245 echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}"239 echo "::set-env name=TARGET_FLAGS::--target ${{ matrix.target }}"
.github/workflows/rust.yml+2−2
@@ -2,9 +2,9 @@ name: Rust · 1 unmodified line
2 2
3on:3on:
4 push:4 push:
5 branches: [ master ]5 branches: [ main ]
6 pull_request:6 pull_request:
7 branches: [ master ]7 branches: [ main ]
8 8
9jobs:9jobs:
10 build-lint-test-benchmark:10 build-lint-test-benchmark:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t