@@ -215,4 +215,2 @@
 	mock.TestingT
 	Cleanup(func())
-},
-) *mockCaches {

@@ -37,6 +37,7 @@ func Execute(ctx context.Context) {
 	registerCmd.Flags().StringVar(&regArgs.Token, "token", "", "Runner token")
 	registerCmd.Flags().StringVar(&regArgs.RunnerName, "name", "", "Runner name")
 	registerCmd.Flags().StringVar(&regArgs.Labels, "labels", "", "Runner tags, comma separated")
+	registerCmd.Flags().BoolVar(&regArgs.Ephemeral, "ephemeral", false, "Configure the runner to be ephemeral and only ever be able to pick a single job")

@@ -56,2 +58,3 @@
-		RunE:  runJob(ctx, &configFile),
+		RunE:  runJob(ctx, &configFile, &runJobArgs),
 	}
+	jobCmd.Flags().BoolVarP(&runJobArgs.wait, "wait", "w", false, "waits until task has been assigned")

@@ -41,6 +42,7 @@ func createRunnerFileCmd(ctx context.Context, configFile *string) *cobra.Command
 	cmd.Flags().StringVar(&argsVar.Secret, "secret", "", "secret shared with the Forgejo instance via forgejo-cli actions register")
 	_ = cmd.MarkFlagRequired("secret")
 	cmd.Flags().StringVar(&argsVar.Name, "name", "", "Runner name")
+	cmd.Flags().BoolVar(&argsVar.Ephemeral, "ephemeral", false, "Configure the runner to be ephemeral and only ever be able to pick a single job")

@@ -125,3 +128,2 @@
 		//
-		if err := ping(cfg, reg); err != nil {
-			return err
+		if args.Connect {

@@ -118,0 +122,4 @@
+	mockPoller := mock_poller.NewPoller(t)
+	mockPoller.On("PollOnce").Return(nil)
+
+	pollTask(context.TODO(), mockPoller, true)

@@ -118,0 +208,4 @@
+	ctx := context.Background()
+
+	tempDir := t.TempDir()
+	runnerFile := tempDir + "/.runner"

@@ -350,0 +355,4 @@
+	reg.Ephemeral = resp.Msg.Runner.Ephemeral
+
+	if inputs.Ephemeral != resp.Msg.Runner.Ephemeral {
+		log.Error("poller: cannot register new runner as ephemeral upgrade Forgejo to enable this feature. The runner has been registered as not ephemeral.")

@@ -37,2 +38,3 @@
 
-func (j *Job) Run(ctx context.Context) error {
+func (j *Job) Run(ctx context.Context, wait bool) error {
+	if wait {

@@ -26,0 +23,4 @@
+	Token     string   `json:"token"`
+	Address   string   `json:"address"`
+	Labels    []string `json:"labels"`
+	Ephemeral bool     `json:"-"`

@@ -419,3 +419,3 @@
 
 			testCase.fixture(t, reporter, client)
-			err = reporter.ReportState()
+			err = reporter.ReportState(true)

@@ -37,6 +37,7 @@ func Execute(ctx context.Context) {
 	registerCmd.Flags().StringVar(&regArgs.Token, "token", "", "Runner token")
 	registerCmd.Flags().StringVar(&regArgs.RunnerName, "name", "", "Runner name")
 	registerCmd.Flags().StringVar(&regArgs.Labels, "labels", "", "Runner tags, comma separated")
+	registerCmd.Flags().BoolVar(&regArgs.Ephemeral, "ephemeral", false, "Instructs Forgejo to delete this runner after it has run one job")

@@ -351,0 +356,4 @@
+	reg.Ephemeral = resp.Msg.Runner.Ephemeral
+
+	if inputs.Ephemeral != resp.Msg.Runner.Ephemeral {
+		return fmt.Errorf("poller: cannot register new runner as ephemeral upgrade Forgejo to enable this feature. The runner has been registered as not ephemeral")

@@ -102,0 +109,4 @@
+	wg := &sync.WaitGroup{}
+
+	// When we start a FetchTask, we'll be requesting (capacity - inProgressTasks) tasks from a remote and may receive
+	// up to that number.  We can't perform multiple fetches simulanteously or else we could be overprovisioned for

@@ -102,0 +130,4 @@
+
+func (p *poller) pollForClient(limiter *rate.Limiter, client client.Client, capacity int64, fetchMutex chan any, taskVersions, inProgressTasks *atomic.Int64, wg *sync.WaitGroup, ephemeral bool) {
+	if ephemeral && capacity > 1 {
+		log.Infof("[poller] connot run ephemeral runner with more than 1 capacity")

@@ -348,6 +353,11 @@ func doRegister(ctx context.Context, cfg *config.Config, inputs *registerInputs)
 	reg.UUID = resp.Msg.GetRunner().GetUuid()
 	reg.Name = resp.Msg.GetRunner().GetName()
 	reg.Token = resp.Msg.GetRunner().GetToken()
+	reg.Ephemeral = resp.Msg.Runner.Ephemeral

@@ -99,3 +100,3 @@
 }
 
-func (p *poller) pollForClient(limiter *rate.Limiter, client client.Client, capacity int64, fetchMutex chan any, taskVersions, inProgressTasks *atomic.Int64, wg *sync.WaitGroup) {
+func (p *poller) PollOnce() {

@@ -102,0 +131,4 @@
+func (p *poller) pollForClient(limiter *rate.Limiter, client client.Client, capacity int64, fetchMutex chan any, taskVersions, inProgressTasks *atomic.Int64, wg *sync.WaitGroup, ephemeral bool) {
+	if ephemeral && capacity > 1 {
+		log.Infof("[poller] connot run ephemeral runner with more than 1 capacity")
+		wg.Done()

@@ -413,2 +414,4 @@
 	r.stateMu.RUnlock()
 
+	if !noMore && state.Result != runnerv1.Result_RESULT_UNSPECIFIED {
+		// skip final ReportState so ReportLog called from reporter.Close() can send its log before the job finishes