Skip to content

Commit d384192

Browse files
authored
Merge pull request #30 from aluzzardi/europa-update
update action to dagger 0.2
2 parents 64f8bd9 + 24d6bfd commit d384192

96 files changed

Lines changed: 15028 additions & 70 deletions

Some content is hidden

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

.github/workflows/ci.yml

Lines changed: 5 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,45 +12,25 @@ on:
1212
pull_request:
1313

1414
jobs:
15-
version:
15+
do:
1616
runs-on: ubuntu-latest
1717
strategy:
1818
fail-fast: false
1919
matrix:
2020
version:
2121
- latest
22-
- 0.1.0-alpha.31
22+
- 0.2.0-beta.1
2323
steps:
2424
-
2525
name: Checkout
2626
uses: actions/checkout@v3
27-
-
28-
name: Init env
29-
run: |
30-
mkdir -p ~/.config/dagger
31-
cp ./test/keys.txt ~/.config/dagger/
3227
-
3328
name: Dagger
3429
uses: ./
3530
with:
3631
version: ${{ matrix.version }}
37-
args: up --no-cache
38-
workdir: ./test
39-
40-
age-secret:
41-
runs-on: ubuntu-latest
42-
if: github.event_name != 'pull_request'
43-
steps:
44-
-
45-
name: Checkout
46-
uses: actions/checkout@v3
47-
-
48-
name: Dagger
49-
uses: ./
50-
with:
51-
age-key: ${{ secrets.DAGGER_AGE_KEY_TEST }}
52-
args: up --no-cache
53-
workdir: ./test
32+
args: do test
33+
workdir: ./test/ci
5434

5535
install-only:
5636
runs-on: ubuntu-latest
@@ -59,16 +39,11 @@ jobs:
5939
matrix:
6040
version:
6141
- latest
62-
- 0.1.0-alpha.17
42+
- 0.2.0-beta.1
6343
steps:
6444
-
6545
name: Checkout
6646
uses: actions/checkout@v3
67-
-
68-
name: Init env
69-
run: |
70-
mkdir ~/.config/dagger
71-
cp ./test/keys.txt ~/.config/dagger/
7247
-
7348
name: Dagger
7449
uses: ./

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,7 @@ jobs:
4343
name: Dagger
4444
uses: dagger/dagger-for-github@v1
4545
with:
46-
age-key: ${{ secrets.DAGGER_AGE_KEY }}
47-
args: up
46+
args: do test
4847
```
4948
5049
### Install Only
@@ -70,7 +69,6 @@ Following inputs can be used as `step.with` keys
7069
| Name | Type | Default | Description |
7170
|------------------|---------|--------------|------------------------------------------------------------------|
7271
| `version` | String | `latest` | Dagger version |
73-
| `age-key` | String | | Dagger private key |
7472
| `args` | String | | Arguments to pass to Dagger |
7573
| `workdir` | String | `.` | Working directory (below repository root) |
7674
| `install-only` | Bool | `false` | Just install Dagger |

action.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ inputs:
1010
description: 'Dagger version'
1111
default: 'latest'
1212
required: false
13-
age-key:
14-
description: 'Dagger private key'
15-
required: false
1613
args:
1714
description: 'Arguments to pass to Dagger'
1815
required: false

dist/index.js

Lines changed: 0 additions & 9 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/context.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import * as core from '@actions/core';
22

33
export interface Inputs {
44
version: string;
5-
ageKey: string;
65
workdir: string;
76
args: string;
87
installOnly: boolean;
@@ -12,7 +11,6 @@ export interface Inputs {
1211
export async function getInputs(): Promise<Inputs> {
1312
return {
1413
version: core.getInput('version') || 'latest',
15-
ageKey: core.getInput('age-key'),
1614
workdir: core.getInput('workdir') || '.',
1715
args: core.getInput('args'),
1816
installOnly: core.getBooleanInput('install-only'),

src/main.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,6 @@ async function run(): Promise<void> {
2121
throw new Error('args input required');
2222
}
2323

24-
if (inputs.ageKey) {
25-
await core.group(`Import Dagger private key`, async () => {
26-
if (!fs.existsSync(path.join(os.homedir(), '.config', 'dagger'))) {
27-
fs.mkdirSync(path.join(os.homedir(), '.config', 'dagger'), {recursive: true});
28-
}
29-
await fs.writeFileSync(path.join(os.homedir(), '.config', 'dagger', 'keys.txt'), inputs.ageKey);
30-
});
31-
}
32-
3324
if (inputs.workdir && inputs.workdir !== '.') {
3425
core.info(`Using ${inputs.workdir} as working directory`);
3526
process.chdir(inputs.workdir);

test/ci/main.cue

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
package main
22

33
import (
4-
"alpha.dagger.io/docker"
5-
"alpha.dagger.io/git"
4+
"dagger.io/dagger"
5+
6+
"universe.dagger.io/alpine"
7+
"universe.dagger.io/bash"
68
)
79

8-
ctr: docker.#Build & {
9-
source: git.#Repository & {
10-
remote: "https://github.com/crazy-max/docker-fail2ban.git"
11-
ref: "refs/tags/0.11.2-r3"
12-
keepGitDir: true
10+
dagger.#Plan & {
11+
actions: test: {
12+
image: alpine.#Build & {
13+
packages: bash: {}
14+
}
15+
16+
bash.#Run & {
17+
input: image.output
18+
script: contents: "echo Hello World!"
19+
}
1320
}
1421
}

test/cue.mod/.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
pkg/** linguist-vendored

test/cue.mod/module.cue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
module: ""
1+
module: ""

test/cue.mod/pkg/.gitignore

Lines changed: 0 additions & 3 deletions
This file was deleted.

0 commit comments

Comments
 (0)