Skip to content

Commit 7063f9b

Browse files
authored
Merge branch 'master' into doc/http-proxy
2 parents 56f69b6 + 67f1984 commit 7063f9b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+1936
-1290
lines changed

.github/workflows/ci.yml

+1-60
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ on:
1111
env:
1212
CARGO_TERM_COLOR: always
1313
REGISTRY: ghcr.io
14-
LATEST_CHANNEL_DIR: ./channel-fuel-latest.toml.d/
1514

1615
jobs:
1716
cancel-previous-runs:
@@ -109,19 +108,6 @@ jobs:
109108
- name: Run Cargo.toml linter
110109
run: git ls-files | grep Cargo.toml$ | xargs --verbose -n 1 cargo-toml-lint
111110

112-
- name: Notify if Job Fails
113-
uses: ravsamhq/notify-slack-action@v1
114-
if: always() && github.ref == 'refs/heads/master'
115-
with:
116-
status: ${{ job.status }}
117-
token: ${{ secrets.GITHUB_TOKEN }}
118-
notification_title: "{workflow} has {status_message}"
119-
message_format: "{emoji} *{workflow}* {status_message} in <{repo_url}|{repo}> : <{run_url}|View Run Results>"
120-
footer: ""
121-
notify_when: "failure"
122-
env:
123-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_NOTIFY_BUILD }}
124-
125111
publish-check:
126112
# Only do this job if publishing a release
127113
needs:
@@ -138,10 +124,8 @@ jobs:
138124
curl -sSLf "https://github.com/TomWright/dasel/releases/download/v1.24.3/dasel_linux_amd64" -L -o dasel && chmod +x dasel
139125
mv ./dasel /usr/local/bin/dasel
140126
./.github/workflows/scripts/verify_tag.sh ${{ github.ref_name }} Cargo.toml
141-
142127
- name: Notify if Job Fails
143128
uses: ravsamhq/notify-slack-action@v1
144-
if: always()
145129
with:
146130
status: ${{ job.status }}
147131
token: ${{ secrets.GITHUB_TOKEN }}
@@ -150,7 +134,7 @@ jobs:
150134
footer: ""
151135
notify_when: "failure"
152136
env:
153-
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_NOTIFY_BUILD }}
137+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TOOLING }}
154138

155139
build-release:
156140
name: build fuelup release binaries
@@ -248,49 +232,6 @@ jobs:
248232
asset_name: ${{ env.ZIP_FILE_NAME }}
249233
asset_content_type: application/gzipa
250234

251-
update-latest-channel:
252-
name: Re-publish the latest channel
253-
needs: [cancel-previous-runs, build-release]
254-
if: github.event_name == 'release' && github.event.action == 'published'
255-
runs-on: ubuntu-latest
256-
steps:
257-
- name: Checkout sources
258-
uses: actions/checkout@v3
259-
260-
- name: Install build-channel script
261-
run: cargo install --debug --path ./ci/build-channel
262-
263-
- name: Checkout gh-pages
264-
uses: actions/checkout@v3
265-
with:
266-
ref: gh-pages
267-
path: gh-pages
268-
269-
# Re-generate the channel TOML file
270-
- name: Rebuild channel with updated components
271-
run: |
272-
mkdir -p ${{ env.LATEST_CHANNEL_DIR }}
273-
CHANNEL_TOML="channel-fuel-latest.toml"
274-
275-
FORC_VERSION=$(grep -A1 '\[pkg.forc\]' ./gh-pages/channel-fuel-latest.toml | cut -d "\"" -f2)
276-
FUEL_CORE_VERSION=$(grep -A1 '\[pkg.fuel-core\]' ./gh-pages/channel-fuel-latest.toml | cut -d "\"" -f2)
277-
278-
PUBLISHED_DATE=$(date +'%Y-%m-%d')
279-
build-channel $CHANNEL_TOML $PUBLISHED_DATE --github-run-id $GITHUB_RUN_ID forc=$FORC_VERSION fuel-core=$FUEL_CORE_VERSION
280-
281-
cp $CHANNEL_TOML ${{ env.LATEST_CHANNEL_DIR }}
282-
283-
- name: Deploy latest channel
284-
if: ${{ env.LATEST_COMPATIBLE_FORC && env.LATEST_COMPATIBLE_FUEL_CORE }}
285-
uses: peaceiris/actions-gh-pages@v3
286-
with:
287-
github_token: ${{ secrets.GITHUB_TOKEN }}
288-
publish_dir: ${{ env.LATEST_CHANNEL_DIR }}
289-
keep_files: true
290-
destination_dir: ./
291-
user_name: 'github-actions[bot]'
292-
user_email: 'github-actions[bot]@users.noreply.github.com'
293-
294235
post-release-checks:
295236
name: Do post-release checks
296237
needs: [cancel-previous-runs, build-release]

.github/workflows/docs.yml

+1
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,4 @@ jobs:
1313
uses: FuelLabs/github-actions/.github/workflows/mdbook-docs.yml@master
1414
with:
1515
docs-src-path: 'docs/src'
16+
spellcheck-config-path: 'docs/.spellcheck.yml'

.github/workflows/gh-pages-meta.yml

+1
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ jobs:
2727
run: |
2828
mkdir -p ${{ env.FUELUP_INIT_DIR }}
2929
cp fuelup-init.sh ${{ env.FUELUP_INIT_DIR }}
30+
cp fuelup-init.sh ${{ env.FUELUP_INIT_DIR }}/index.html
3031
3132
- name: Deploy latest fuelup init
3233
uses: peaceiris/actions-gh-pages@v3

.github/workflows/index-versions.yml

-155
This file was deleted.

.github/workflows/nightly-cargo-audit.yml

+12
Original file line numberDiff line numberDiff line change
@@ -12,3 +12,15 @@ jobs:
1212
- uses: actions-rs/audit-check@v1
1313
with:
1414
token: ${{ secrets.GITHUB_TOKEN }}
15+
- name: Notify if Job Fails
16+
uses: ravsamhq/notify-slack-action@v1
17+
with:
18+
status: ${{ job.status }}
19+
token: ${{ secrets.GITHUB_TOKEN }}
20+
notification_title: "{workflow} has {status_message}"
21+
message_format: "{emoji} *{workflow}* {status_message} in <{repo_url}|{repo}> : <{run_url}|View Run Results>"
22+
footer: ""
23+
notify_when: "failure"
24+
env:
25+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TOOLING }}
26+

.github/workflows/publish-nightly-channel.yml

+12
Original file line numberDiff line numberDiff line change
@@ -57,3 +57,15 @@ jobs:
5757
destination_dir: ${{ steps.setup.outputs.archive_dir }}
5858
user_name: 'github-actions[bot]'
5959
user_email: 'github-actions[bot]@users.noreply.github.com'
60+
61+
- name: Notify if Job Fails
62+
uses: ravsamhq/notify-slack-action@v1
63+
with:
64+
status: ${{ job.status }}
65+
token: ${{ secrets.GITHUB_TOKEN }}
66+
notification_title: "{workflow} has {status_message}"
67+
message_format: "{emoji} *{workflow}* {status_message} in <{repo_url}|{repo}> : <{run_url}|View Run Results>"
68+
footer: ""
69+
notify_when: "failure"
70+
env:
71+
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_TOOLING }}

0 commit comments

Comments
 (0)