Skip to content

Commit 27357b8

Browse files
compulimcompulim
authored
Add timeout per step
1 parent f9167bf commit 27357b8

File tree

2 files changed

+2
-196
lines changed

2 files changed

+2
-196
lines changed

‎.github/actions/azdo-build/action.yml‎

Lines changed: 0 additions & 194 deletions
Original file line numberDiff line numberDiff line change
@@ -47,16 +47,6 @@ inputs:
4747
required: true
4848
type: string
4949

50-
# dist-tag:
51-
# description: Dist-tag
52-
# default: main
53-
# type: string
54-
55-
# version:
56-
# description: Version
57-
# required: true
58-
# type: string
59-
6050
outputs:
6151
version:
6252
description: Version
@@ -82,23 +72,6 @@ runs:
8272
fi
8373
shell: bash
8474

85-
# - name: Azure login
86-
# run: |
87-
# # az login \
88-
# # --client-id ${{ inputs.azure-client-id }} \
89-
# # --federated-token ${{ github.token }} \
90-
# # --identity \
91-
# # --subscription ${{ inputs.azure-subscription-id }} \
92-
# # --tenant ${{ inputs.azure-tenant-id }}
93-
94-
# az login \
95-
# --allow-no-subscription \
96-
# --federated-token ${{ github.token }} \
97-
# --service-principal \
98-
# --tenant ${{ inputs.azure-tenant-id }} \
99-
# --username ${{ inputs.azure-client-id }}
100-
# shell: bash
101-
10275
- uses: azure/login@v2
10376
with:
10477
allow-no-subscriptions: true
@@ -252,170 +225,3 @@ runs:
252225
if [[ "$VERSION" == *-* ]]; then echo version-type=prerelease | tee --append $GITHUB_OUTPUT; else echo version-type=production | tee --append $GITHUB_OUTPUT; fi
253226
shell: bash
254227
working-directory: ./artifact-download/tgzfiles
255-
256-
# prepare-release:
257-
# name: Prepare release
258-
# needs:
259-
# - upload-pipeline-artifact
260-
# outputs:
261-
# prerelease: ${{ steps.save-version.outputs.prerelease }}
262-
# version: ${{ steps.save-version.outputs.version }}
263-
# permissions:
264-
# actions: read
265-
# contents: read
266-
# id-token: write
267-
# runs-on: ubuntu-latest
268-
269-
# steps:
270-
# - uses: actions/checkout@v6
271-
# - uses: actions/setup-node@v6
272-
273-
# - name: Download build artifact
274-
# uses: actions/download-artifact@v7
275-
# with:
276-
# name: drop_build_main
277-
# path: ./azdo-artifact/
278-
279-
# - name: Prepare CDN artifact
280-
# run: |
281-
# mkdir -p ./github-artifact/cdn/
282-
# cd ./github-artifact/cdn/
283-
# unzip ../../azdo-artifact/cdn_files/CdnFilesUpload.zip
284-
285-
# - name: Upload CDN artifact
286-
# uses: actions/upload-artifact@v6
287-
# with:
288-
# name: asset-cdn
289-
# path: ./github-artifact/cdn/
290-
291-
# - name: Prepare tarball artifact
292-
# run: |
293-
# mkdir -p ./github-artifact/tarball/
294-
# cd ./github-artifact/tarball/
295-
# cp ../../azdo-artifact/tgzfiles/* .
296-
297-
# - name: Upload tarball artifact
298-
# uses: actions/upload-artifact@v6
299-
# with:
300-
# name: asset-tarball
301-
# path: ./github-artifact/tarball/
302-
303-
# - id: save-version
304-
# name: Save version
305-
# run: |
306-
# version=$(cat version.txt)
307-
308-
# prerelease=$([[ "$version" == *-* ]] && echo true || echo false)
309-
310-
# echo prerelease="$prerelease" | tee --append $GITHUB_OUTPUT
311-
# echo version="$version" | tee --append $GITHUB_OUTPUT
312-
# working-directory: ./azdo-artifact/version/
313-
314-
# - name: Prepare release notes
315-
# run: |
316-
# cp ./.github/release_notes_template.md ./release_notes.md
317-
318-
# node \
319-
# --eval "import fs from 'node:fs'; fs.writeFileSync(process.argv[1], fs.readFileSync(process.argv[1], 'utf8').replaceAll(process.argv[2], process.argv[3]));" \
320-
# --input-type=module \
321-
# -- \
322-
# ./release_notes.md \
323-
# {{webchat-js-integrity}} \
324-
# "sha384-$(openssl dgst -sha384 -binary ./github-artifact/cdn/webchat.js | openssl base64 -A)"
325-
326-
# node \
327-
# --eval "import fs from 'node:fs'; fs.writeFileSync(process.argv[1], fs.readFileSync(process.argv[1], 'utf8').replaceAll(process.argv[2], process.argv[3]));" \
328-
# --input-type=module \
329-
# -- \
330-
# ./release_notes.md \
331-
# {{webchat-minimal-js-integrity}} \
332-
# "sha384-$(openssl dgst -sha384 -binary ./github-artifact/cdn/webchat-minimal.js | openssl base64 -A)"
333-
334-
# node \
335-
# --eval "import fs from 'node:fs'; fs.writeFileSync(process.argv[1], fs.readFileSync(process.argv[1], 'utf8').replaceAll(process.argv[2], process.argv[3]));" \
336-
# --input-type=module \
337-
# -- \
338-
# ./release_notes.md \
339-
# {{version}} \
340-
# "${{ steps.save-version.outputs.version }}"
341-
342-
# cat ./release_notes.md
343-
344-
# - name: Upload release notes
345-
# uses: actions/upload-artifact@v6
346-
# with:
347-
# name: release-notes
348-
# path: ./release_notes.md
349-
350-
# create-release:
351-
# name: Create release
352-
# needs:
353-
# - prepare-release
354-
# outputs:
355-
# release-tag: ${{ steps.create-release.outputs.release-tag }}
356-
# permissions:
357-
# contents: write
358-
# runs-on: ubuntu-latest
359-
360-
# steps:
361-
# - name: Download release notes
362-
# uses: actions/download-artifact@v7
363-
# with:
364-
# name: release-notes
365-
# path: release-notes
366-
367-
# - env:
368-
# GH_TOKEN: ${{ github.token }}
369-
# id: create-release
370-
# name: Create release
371-
# run: |
372-
# if [[ "${{ needs.prepare-release.outputs.prerelease }}" == "true" ]]; then prerelease=1; fi
373-
374-
# release_tag=v${{ needs.prepare-release.outputs.version }}
375-
376-
# gh release create $release_tag \
377-
# --draft \
378-
# --notes-file ./release-notes/release_notes.md \
379-
# ${prerelease:+--prerelease} \
380-
# --repo ${{ github.repository }} \
381-
# --target ${{ github.ref }}
382-
383-
# echo release-tag=$release_tag | tee --append $GITHUB_OUTPUT
384-
385-
# upload-release-asset:
386-
# name: Upload release asset
387-
# needs:
388-
# - create-release
389-
# permissions:
390-
# contents: write
391-
# runs-on: ubuntu-latest
392-
393-
# steps:
394-
# - name: Download asset artifact
395-
# uses: actions/download-artifact@v7
396-
# with:
397-
# merge-multiple: true
398-
# path: ./asset/
399-
# pattern: asset-*
400-
401-
# - env:
402-
# GH_TOKEN: ${{ github.token }}
403-
# name: Upload assets
404-
# run: |
405-
# gh release upload ${{ needs.create-release.outputs.release-tag }} \
406-
# ./asset/* \
407-
# --repo ${{ github.repository }}
408-
409-
# - env:
410-
# GH_TOKEN: ${{ github.token }}
411-
# name: Publish release
412-
# run: |
413-
# gh release edit ${{ needs.create-release.outputs.release-tag }} \
414-
# --draft=false \
415-
# --repo ${{ github.repository }}
416-
417-
# - continue-on-error: true
418-
# if: ${{ always() }}
419-
# name: Azure logout
420-
# run: az logout
421-
# shell: bash

‎.github/workflows/create-release.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@ jobs:
157157
echo branch-name=$BRANCH_NAME | tee --append $GITHUB_OUTPUT
158158
159159
- id: azdo-build
160+
timeout-minutes: 45
160161
uses: ./.github/actions/azdo-build
161162
with:
162163
artifact-name: azdo-artifact
@@ -167,7 +168,6 @@ jobs:
167168
azure-subscription-id: ${{ vars.AZURE_SUBSCRIPTION_ID }}
168169
azure-tenant-id: ${{ vars.AZURE_TENANT_ID }}
169170
download-artifact-name: drop_build_main
170-
# pipeline-variable: ProjectBranch=${{ steps.get-branch-name.outputs.branch-name }}
171171
pipeline-variable: |
172172
ProjectBranch=${{ steps.get-branch-name.outputs.branch-name }}
173173
ProjectRepository=${{ github.repository }}
@@ -223,7 +223,7 @@ jobs:
223223
uses: actions/upload-artifact@v7
224224
with:
225225
name: fluent-theme-iife
226-
path: ./fluent-theme/dist/webchat*.js
226+
path: ./fluent-theme/dist/
227227

228228
- name: Upload artifact (fluent-theme-esm)
229229
uses: actions/upload-artifact@v7

0 commit comments

Comments
 (0)