Skip to content

Commit c8e580f

Browse files
committed
fix CI
1 parent 2c3b59a commit c8e580f

File tree

2 files changed

+39
-56
lines changed

2 files changed

+39
-56
lines changed

.github/workflows/release.yaml

Lines changed: 26 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
name: "Release dev container features & Generate Documentation"
22
on:
33
workflow_dispatch:
4+
push:
5+
branches:
6+
- main
47

58
jobs:
69
deploy:
@@ -19,29 +22,29 @@ jobs:
1922
publish-features: "true"
2023
base-path-to-features: "./src"
2124
generate-docs: "true"
22-
25+
2326
env:
2427
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2528

26-
# - name: Create PR for Documentation
27-
# id: push_image_info
28-
# env:
29-
# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
30-
# run: |
31-
# set -e
32-
# echo "Start."
33-
# # Configure git and Push updates
34-
# git config --global user.email github-actions[bot]@users.noreply.github.com
35-
# git config --global user.name github-actions[bot]
36-
# git config pull.rebase false
37-
# branch=automated-documentation-update-$GITHUB_RUN_ID
38-
# git checkout -b $branch
39-
# message='Automated documentation update'
40-
# # Add / update and commit
41-
# git add */**/README.md
42-
# git commit -m 'Automated documentation update [skip ci]' || export NO_UPDATES=true
43-
# # Push
44-
# if [ "$NO_UPDATES" != "true" ] ; then
45-
# git push origin "$branch"
46-
# gh pr create --title "$message" --body "$message"
47-
# fi
29+
- name: Create PR for Documentation
30+
id: push_image_info
31+
env:
32+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
33+
run: |
34+
set -e
35+
echo "Start."
36+
# Configure git and Push updates
37+
git config --global user.email github-actions[bot]@users.noreply.github.com
38+
git config --global user.name github-actions[bot]
39+
git config pull.rebase false
40+
branch=automated-documentation-update-$GITHUB_RUN_ID
41+
git checkout -b $branch
42+
message='Automated documentation update'
43+
# Add / update and commit
44+
git add */**/README.md
45+
git commit -m 'Automated documentation update [skip ci]' || export NO_UPDATES=true
46+
# Push
47+
if [ "$NO_UPDATES" != "true" ] ; then
48+
git push origin "$branch"
49+
gh pr create --title "$message" --body "$message"
50+
fi

.github/workflows/test.yaml

Lines changed: 13 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
name: "CI - Test Features"
22
on:
33
push:
4-
branches:
5-
- main
64
pull_request:
7-
workflow_dispatch:
85

96
jobs:
107
test-autogenerated:
@@ -13,7 +10,7 @@ jobs:
1310
strategy:
1411
matrix:
1512
features:
16-
- terminal-history
13+
- bash-config
1714
baseImage:
1815
- debian:latest
1916
- ubuntu:latest
@@ -24,35 +21,18 @@ jobs:
2421
run: |
2522
npm install -g @devcontainers/cli
2623
mkdir -p ~/.config/devcontainer_rc
27-
24+
2825
- name: "Generating tests for '${{ matrix.features }}' against '${{ matrix.baseImage }}'"
2926
run: devcontainer features test --skip-scenarios -f ${{ matrix.features }} -i ${{ matrix.baseImage }} .
3027

31-
# test-scenarios:
32-
# runs-on: ubuntu-latest
33-
# continue-on-error: true
34-
# strategy:
35-
# matrix:
36-
# features:
37-
# - color
38-
# - hello
39-
# steps:
40-
# - uses: actions/checkout@v4
41-
#
42-
# - name: "Install latest devcontainer CLI"
43-
# run: npm install -g @devcontainers/cli
44-
#
45-
# - name: "Generating tests for '${{ matrix.features }}' scenarios"
46-
# run: devcontainer features test -f ${{ matrix.features }} --skip-autogenerated --skip-duplicated .
47-
#
48-
# test-global:
49-
# runs-on: ubuntu-latest
50-
# continue-on-error: true
51-
# steps:
52-
# - uses: actions/checkout@v4
53-
#
54-
# - name: "Install latest devcontainer CLI"
55-
# run: npm install -g @devcontainers/cli
56-
#
57-
# - name: "Testing global scenarios"
58-
# run: devcontainer features test --global-scenarios-only .
28+
test-global:
29+
runs-on: ubuntu-latest
30+
continue-on-error: true
31+
steps:
32+
- uses: actions/checkout@v4
33+
34+
- name: "Install latest devcontainer CLI"
35+
run: npm install -g @devcontainers/cli
36+
37+
- name: "Testing global scenarios"
38+
run: devcontainer features test --global-scenarios-only .

0 commit comments

Comments
 (0)